Upgrade from 1.10.6 to 1.11.8 fails because of inconsistent changeset

I was just trying to upgrade from 1.10.6 to 1.11.8 and it's failing because of a checksum validation error during the liquibase update. I checked and it does look like as part of TRUNK-3422 inconsistent change sets were introduced:

https://github.com/openmrs/openmrs-core/blob/1.10.x/api/src/main/resources/liquibase-update-to-latest.xml#L7768

vs

https://github.com/openmrs/openmrs-core/blob/1.11.x/api/src/main/resources/liquibase-update-to-latest.xml#L8781

See Talk thread here:

https://talk.openmrs.org/t/cant-upgrade-from-openmrs-1-10-6-to-openmrs-1-11-8/14747/7

Also existing trunk ticket that introduced the issue:

TRUNK-3422