Merge "Bugfix: fix the errors of onos_sfc"