EMPIREDB-410
Javadoc fixes
23 files changed