Merge "Makefile: Finalize RPM repo switch."