Get ELB integration tests running in Python 3 and some PEP8 cleanup.
Fix Python 2.6 tests
Merge branch 'garnaat-fix-elb-integration-tests' into develop. Fixes #2369.