Merge from upstream openstack/stable/folsom