[OS-BUILD PATCH 0/2] Cleanup fixes for rt-devel