Make all imports consistent with https://pagure.io/koji/issue/830 Fixes: https://pagure.io/koji/issue/1001