Merge "Revert "Revert "RESTRICT AUTOMERGE Edit tests to assert either old or new behavior""" into sc-v2-dev