Allow defaults.py to override swift tunnel ports
Merge pull request #3 from NielsZeilemaker/test-cleanup

Allow defaults.py to override swift tunnel ports