Merge proposals dependent on lp://qastaging/~slash-m3/unity/fix-bug-730623

lp://qastaging/~slash-m3/unity/fix-bug-730623 has no merge proposals.