Fix some tidy and javadoc warnings/errors Reviewed-by: lancea, rriggs
Reviewed-by: chegar, plevart, psandoz, darcy, martin, alanb