Merge branch 'jb_unit_tests' into n1k-plugin
Improvement on unit test framework for N1KV
Adding a check for config-dir options for unit tests
Renaming a test case
Merge branch 'n1k-plugin' of https://github.com/CiscoSystems/quantum into n1k-plugin
Fixed conflict
Merge branch 'n1k-plugin' of http://github.com/CiscoSystems/quantum into n1k-plugin
Enabled some failing unit tests again
Getting the HTTP tests to work.

Moving the processing of additional args and kwargs into _create_network(),
since that is called directly from some unit tests.