ivs: eff697d Merge into master from pull request #171: move CFR into pipeline_standard (https://github.com/floodlight/ivs/pull/171)