Merge pull request #24247 from tiborvass/fix-rpm-for-fedora24

fix F24 rpm build