more capabilities fixes for stateful vlan and firewall tests
Merge pull request #37 from daniellemayne/2014.03

2014.03 - more capabilities fixes for stateful vlan and firewall tests
Fixed a few typos in firewall tests. VPC was being passed instead of the subnet. Also made VPC conditional slightly broaded to include OPTIONAL.