Merge into master from pull request #66:
flow_query: handle different switch representations of nw src/dst masks (https://github.com/floodlight/oftest/pull/66)