Merge "Move RPM directory out of old packaging dir"