Fix some small issues with rpm support#796

manuelnaranjo wants to merge 2 commits intobazelbuild:mainbazelbuild/rules_pkg:mainfrom

bookingcom:mainbookingcom/rules_pkg:mainCopy head branch name to clipboard