tiny refactoring and include some map interfaces in javadocs
include missing source files to javadoc
Merge pull request #3382 from ahmetmircik/new/3.3/refactorings

Tiny refactoring & addition of some missing files to javadoc generation