Merge "Fix deployment errors for odl-fdio scenarios"