converting to SNAPSHOT so that mescal builds
Merge branch 'dev' of https://github.com/iPlantCollaborativeOpenSource/DiscoveryEnvironmentBackend into dev