some fixes to now regenerated javadocs
trying to resolve merge conflict