Cherry pick r87 from bug720816
Cherry pick r87 from bug720816
saeki-masaki/glance,JioCloud/glance,scripnichenko/glance,darren-wang/gl,akash1808/glance,tanglei528/glance,openstack/glance,rickerc/glance_audit,SUSE-Cloud/glance,tanglei528/glance,wkoathp/glance,wkoathp/glance,stevelle/glance,ozamiatin/glance,vuntz/glance,cloudbau/glance,cloudbau/glance,akash1808/glance,sigmavirus24/glance,ntt-sic/glance,kfwang/Glance-OVA-OVF,takeshineshiro/glance,citrix-openstack-build/glance,jumpstarter-io/glance,dims/glance,paramite/glance,klmitch/glance,openstack/glance,redhat-openstack/glance,jumpstarter-io/glance,ntt-sic/glance,takeshineshiro/glance,sigmavirus24/glance,scripnichenko/glance,rajalokan/glance,dims/glance,stevelle/glance,paramite/glance,JioCloud/glance,citrix-openstack-build/glance,saeki-masaki/glance,rickerc/glance_audit,ozamiatin/glance,SUSE-Cloud/glance,rajalokan/glance,klmitch/glance,redhat-openstack/glance,openstack/glance,vuntz/glance,kfwang/Glance-OVA-OVF,darren-wang/gl