[release/v1.4.x] Fix state when configuration set back to current state following upgrade failure

[release/v1.4.x] Fix state when configuration set back to current state following upgrade failure #3206