Work around rhel5/openstack quantum metadata issue.
Merge branch 'master' into mdediting