Unity

Merge proposals dependent on lp://qastaging/~timo-jyrinki/unity/revert_fix_1067534-6.0

  1. revert_fix_1067534-6.0
  2. Dependent merge proposals

lp://qastaging/~timo-jyrinki/unity/revert_fix_1067534-6.0 has no merge proposals.