Re: [Openstack-stable-maint] Merges to stable/folsom