Add test test_router_with_alloc_pool_and_gateway, follow pep guidelines
Merge remote-tracking branch 'upstream/master'
Restructure infra files and test code to help avoid code duplication

Test Discovery on scripts/ and serial_scripts/ can now happen independent of each other
Move commonly required feature-related test files to common/<feature-name>
Move any useful utils into tcutils/<feature-name>
feature-specific base.py can be used only once in common/<feature>/base.py and both serial and parallel tests can refer to it
Correct couple of import paths, add right indentation
Remove log stmts which were added for temporary debugging
Resolve merge conflicts and correct couple of import statements
Fix script issues in router snat,port tests, add log stmts to help debug
Merge remote-tracking branch 'upstream/master'
Use wait_till_vm_is_up instead of verify_on_setup for neutron tests
Merge remote-tracking branch 'upstream/master'
Set PYTHONPATH which could have got changed earlier
Resolve conflicts with lbaas code merge
Return the SG rule created in create_security_group_rule() method

On creating a SG rule, we were not returning the SG rule dict.
Corrected it now
Import changes in lbaas to handle recent code refactoring
Return the right floatingips in create_floatingips()

Earlier we were returning all the fips in the tenant in create_floatingips()
method.
Now, return only list of fips created in create_floatingips() and handle
the same in delete_floatingips()
Run serial/parallel tests with their own PYTHONPATH
Merge pull request #114 from vedujoshi/master

Add test test_router_with_alloc_pool_and_gateway, follow pep guidelines