Minor variable rename/tweak.

Signed-off-by: crynobone <crynobone@gmail.com>
Add Orchestra\Extension\Traits\OperationTrait.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.2'