Merge "Consolidate ODL SFC RPM into ODL RPM" into stable/colorado