Updated a few pieces to include work towards cinder-volumes
Merge branch 'ubuntu-maas' of https://github.com/Tehsmash/grizzly-manifests into ubuntu-maas