Merge "Configure bridge_mappings for ovs and linuxbridge agents"