Fixed occupancy for OpenStack
Fixed occupancy for Euca
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere