Modify tests; we now allow offline node removal with a node which is not second-from-last.
Merged bug25659 into stable