Merge "Add acceptance tests for cherry picking a change to the same branch"