BUGFIX - ATMO-431
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja