Merge pull request #138 from vedujoshi/master

Fix circular dependent imports, and correct import by name
Import sdn_policy_topo_with_multi_project, policy_test_helper correctly
Merge remote-tracking branch 'upstream/master'