ivs: 4758b6c Merge into master from pull request #197: Uplink configuration (https://github.com/floodlight/ivs/pull/197)