[master/rhel7] Clean up some rpmdiff errors (#1012624)