Merge "Bug fixes odl-sfc + new features"