Bug 986300 - Pulling in a few cleanup commits from Fedora