Merge proposals dependent on lp://staging/~pieq/checkbox/fix-1484872-env-variables-forced-to-non-international-in-differential-env

1. fix-1484872-env-variables-forced-to-non-international-in-differential-env
2. Dependent merge proposals