more fixes to use capabilities for stateful vlan and firewall tests
merge conflict fix
and another
Merge pull request #38 from daniellemayne/develop

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