follow up on the initial changes. add as many UT as possible for HA + MT config set/rollback
Closes #2799 (closed)