To reduce rebase burden, just modify upstream example with our Fedora specific changes. The result should be the same, but without the need to manually add new features into separate config file.
