[anaconda][rhel7-branch][PATCH 0/2] Fix environment handling