Re-ordered migrations so that --merge is not required
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar