Herja-production changes that persisted. Probably going to have some merge fails here
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar