Merge proposals dependent on lp://qastaging/~yolanda.robla/ceilometer/icehouse_refreshed_patch

lp://qastaging/~yolanda.robla/ceilometer/icehouse_refreshed_patch has no merge proposals.