Minor source cleanup, use jdk 1.6 @Overrides instead of /** {@inheritDoc} */ doc tags

Minor source cleanup, use jdk 1.6 @Overrides instead of /** {@inheritDoc} */ doc tags