Improves handling of Java methods with void return type.

Minor tweak to regex so that the '@return' tag is not added for methods that
include multiple keywords and return void.
Merged conflicts.