[initial-setup][rhel7-branch][PATCH 0/2] Restore compatibility with rebased Anaconda