Merge "os-net-config templates to configure vlans on bond"