Merge proposals dependent on lp://qastaging/~mhr3/unity/a-few-fixes

lp://qastaging/~mhr3/unity/a-few-fixes has no merge proposals.