Output Objective-C parameter names where $(javaparam) is used in a comment block.
Undo change that breaks the @return comment in java comments
Use parens in 'if' statement
Fix code indent
Merge branch 'master' of github.com:bengardner/uncrustify