Merge "Consolidate ODL SFC RPM into ODL RPM"