Merge "Doc updates: Javadoc fixes" into klp-docs