Merge branch 'dev' of code.ornl.gov:ndip/galaxy into api-token-auth