Comply with checkstyle rules for previous commit ; minor additional JavaDoc enhancements

stash that one
OGM-563 Improve clean up of Map datastore, JavaDoc and rename minor variables