Core fix for https://fedorahosted.org/389/ticket/47721 is already reviewed/pushed.

Additional cleanup is following up with the fix and CI tests that are broken

https://fedorahosted.org/389/attachment/ticket/47721/0001-Ticket-47721-Schema-Replication-Issue-follow-up-clea.patch