Pushed to master. Waiting for [rhbz#1193389] (https://bugzilla.redhat.com/show_bug.cgi?id=1193389) to be accepted as F22 blocker so that I can cherry-pick the changes also to the f22-branch. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/75