[backport-1.6]: observed occurences where cluster-maxunavailable is defeated

A solution for issue #3234 needs to be backported to 1.6.x