Javadoc improvements + minor other cleanup
Merge pull request #3137 from pveentjer/javadoc/3.x/map-merge

Javadoc improvements + minor other cleanup