More cleanup in AsyncMetadataVersionManagerTest.java. Adding test timeout and removing the retry loops