Merge proposals dependent on lp://qastaging/~jrrowe89/unity/Fix-for-bug-717250

lp://qastaging/~jrrowe89/unity/Fix-for-bug-717250 has no merge proposals.