squash after fixes for merge
Merge remote-tracking branch 'origin/quotas2' into quotas2

Conflicts:
	apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java