Merge "Move few local ODL SFC confs to global functest confs"