Fix todo in TestRecoveryMultipleDataSources
Reenable tests in TestRecoveryScenarios
Reenable tests in TestConcurrentRotation
Merge pull request #2739 from davidegrohmann/2.2-fix-todos

Cleanups and reenabling tests