Merge pull request #37 from daniellemayne/2014.03

2014.03 - more capabilities fixes for stateful vlan and firewall tests