Fixed ERRAI-463: Nested type params on maps don't work
minor javadoc fix
Merge branch 'master' into 3.0