Merge "BUG-6070 dpid changes as ports added to bridge"