removed vpc and vhdx
Merge branch 'master' of github.com:gabriel-samfira/cinder

Conflicts:
	cinder/volume/drivers/smbfs.py