Fix compiler warnings. Fix Javadoc warnings.
(cherry picked from commit c5a1ee021016d37dda5e5eb96320ee1be9869314) Signed-off-by: John Blum <jblum@pivotal.io>