Upgrade from 8.4 to 8.5.1 fails with Duplicate MCS error after running cleanup script and manual reset of MCS