Title: #1126: Backport PR 930 to ipa-4-6
This PR was opened automatically because PR #930 was pushed to master and backport to
ipa-4-6 is required.
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1126/head:pr1126
git checkout pr1126