Merge "Test Rollback Manager can handle time change"