ChunkServer Recovery cont'd
Merge branch 'travis23'