develop - more fixes to use capabilities for stateful vlan and firewall tests