Update Rubocop

This change updates the version of Rubocop used, and makes changes to
make Rubocop happy.

It also updates to the latest version of Tomcat.
Merge branch 'update-rubocop'