Merge "Fix interface role mapping config for odl-fdio scenarios" into stable/euphrates