[backport-1.6]: Rolling update detected after pivot in CAPM3 (real BMH) run

A solution for issue #3635 (closed) needs to be backported to 1.6.x