Fixed #1504 infinite waiting on merge operations when cluster shuts down meanwhile
Merge pull request #1984 from noctarius/fixed-inifinite-waiting

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