Merge into master from pull request #142:
Python 2.7 Updates (https://github.com/floodlight/oftest/pull/142)