[Bug 1363724] Fix rpmgrill issues