Increase timeout in tabletmanager test.
Removing the tabletmanager->tm rename.
Merge branch 'replication'