test readme (rebased onto develop)



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

----

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