Cleanup fixes for rt-devel

More cleanup fixes to handle daily merges for rt-devel and automotive-devel.

Tested by simulating the two daily cronjob in test-os-builds.

Signed-off-by: Don Zickus dzickus@redhat.com