test 59ebf2da-971d-43bd-b264-54a8af883bc5 (rebased onto develop)



This is the same as gh-2262 but rebased onto develop.

----

This is a call to Sandbox.open_pr by gration.TestRebase.TestConflictingRebase.testPushRebaseContinue