Add support for IPA_SERVER_IP.
Merge branch 'master' into fedora-20
Merge branch 'fedora-20' into fedora-20-upstream