We want to update the IP address right after configuration as well.
Merge branch 'master' into fedora-20
Merge branch 'fedora-20' into fedora-20-upstream