Merge --squash rpm-master
    
    Conflicts:
    	.gitignore
    	0001-Don-t-access-the-net-while-building-docs.patch
    	0001-Remove-runtime-dep-on-python-pbr.patch
    	0003-avoid-unsupported-storage-drivers.patch
    	0004-notify-calling-process-we-are-ready-to-serve.patch
    	openstack-glance.spec
    	sources
    
    Change-Id: I018fe127ad88670057dbfac4ac48fd58344d639f