Merge "Fix grammar nits in bond-with-vlans templates"