Unit test fixes for changed cluster message handling logic.
Removed an unnecessary rassert.
Merge branch 'next' into daniel_1670