am 2b3a47b9: Merge "Allow L2TP traffic to lockdown VPN servers."

* commit '2b3a47b9ce0f422323395286937944a2afa51ed6':
  Allow L2TP traffic to lockdown VPN servers.