Merge proposals dependent on lp://qastaging/~bladernr/checkbox/1488131-fix-env-vars

lp://qastaging/~bladernr/checkbox/1488131-fix-env-vars has no merge proposals.