Merge "Do not link networks with VRRP gateway mac addresses" into sc-dev