merge some patches from F23 for F24 fedora-cloud-base.ks