Merge branch 'dev' of code.ornl.gov:ndip/galaxy into 128-stdout-not-none