operations: Implement UserCherryPick in pure git

Implement the UserCherryPick RPC using pure git commands, using git-merge-tree(1) more specific.

This change is still behind a feature flag.

Issue: #4574 (closed) Changelog: changed Milestone: 16.2