Trivial fixes based on CheckStyle and Findbugs
Merge branch 'master' of github.com:wikimedia/kraken