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

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