Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb

Cleanup build rpm deb