Merge "Renames ChunkListing.java to ChunkListingMap.java."