NAS-2384 Fixed javadoc to avoid cyclic references to other modules