[Openstack-stable-maint] stable/havana gate blockers heat+glance

Hi-

Had a hard time getting the 2013.2.3 -> 2013.2.4 version bump through the stable/havana gate. All are bumped with the exception of Heat and Glance. I've put up two backports that should fix the issues there, any help getting these merged would be appreciated:

Heat https://review.openstack.org/91684 https://review.openstack.org/89438

Glance https://review.openstack.org/90273 https://review.openstack.org/89437

Cheers Adam