Merge "Fix yamllint for vpnservice"