Merge from openstack/horizon @8/4/2104

Merge from openstack/horizon @8/4/2014 

https://github.com/openstack/horizon/commit/fd2bfa7df53ca38bfc3237466713e9fa5d1cb068