Merge "Remove ovs from ovs bridge config"