Fixed #1504 infinite waiting on merge operations when cluster shuts down...

... meanwhile