Merge into master from pull request #70:
testutils improvements (https://github.com/floodlight/oftest/pull/70)