Merge some F23 commits to master for fedora-cloud-base.ks

[Dusty Mabe]

NOTE: Please merge this to the master branch

In F23 we added some commits to make the build work. These commits
were never merged to master (rawhide) so let's do that now.