Merge changes Ic6ff7a3d,Iff9b9792

* changes:
  Refactor code and improve tests for VPN filtering
  Remove LOCKDOWN from FirewallChain IntDef