EMPIREDB-386
More Javadoc fixes
20 files changed