M4 javadoc update

Ran 'ant format-javadoc -Dupdate=true' and addressed these updates that needed to be made. Thanks.