JBTM-1984 Updated to only close the recoveryConnection when theModifier is not null
[JBTM-1978] Trigger recovery (rather than wait). Also a refactor of the CR05_1 tests.