[GEOS-6770] Allow flow controllers access to the current Operation
Merge remote-tracking branch 'upstream/master'