Update JavaDoc and remove usage of MapUtils brought in via optional transitive dependency. Original Pull Request: #255