More changes to support teamed Quantum mode.
Merge pull request #1800 from VictorLowther/pull-req-master-c9539d81711c2214b06995a82fd0ca64896a1732

Add gre mode support to Quantum. [4/4]