Merge proposals dependent on lp://qastaging/~cisco-openstack/heat/icehouse

lp://qastaging/~cisco-openstack/heat/icehouse has no merge proposals.