Merge into master from pull request #166:
Revert "Use a short timeout when polling for packets." (https://github.com/floodlight/oftest/pull/166)