LPS-31948 edited javadoc

Hi Sergio, If it all looks good to you, please rebase and send a PR to bchan to merge into trunk. Thanks.