Clean up in NetworkResources.
Formatting
Updated to use capabilities instead of deprecated methods
Fixed merge
Merge pull request #22 from greese/2014.03

2014.03 merge from develop
Added null check for keypairs
Merge pull request #24 from maksimov/develop

Added null check for keypairs
Fixing tests broken by new keypair handling
Merge pull request #27 from maksimov/develop

Fixing tests broken by new keypair handling
Better failure reporting for StatefulLoadBalancerTests#addServer.
Merge pull request #29 from maksimov/develop

Better failure reporting for StatefulLoadBalancerTests#addServer.
Merge pull request #8 from greese/develop

merge in upstream dasein changes
merge capabilities changes to develop
Merge pull request #31 from daniellemayne/develop

merge capabilities changes to develop
Smaller correction in logging
fixed order of checks so that unsupported actions do not cause test fail
Merge pull request #33 from daniellemayne/develop

develop - fixed order of checks so that unsupported actions do not cause test fail
Smaller correction in logging
Better output of firewall match assertion
Merge branch 'develop' of https://github.com/maksimov/dasein-cloud-test into develop