Naming mismatch -- Matches v1 Spec
Merge branch 'california-condor' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into california-condor
Merge branch 'california-condor'