Merge proposals dependent on lp://qastaging/~gmpc-trunk/gmpc/gmpc-alarm

lp://qastaging/~gmpc-trunk/gmpc/gmpc-alarm has no merge proposals.