Merge some F23 commits to F24 fedora-cloud-base.ks