Merge proposals dependent on lp://qastaging/~yolanda.robla/heat/icehouse_add_heatclient

lp://qastaging/~yolanda.robla/heat/icehouse_add_heatclient has no merge proposals.