Update to merged version of active-fedora