Fix remaining whitespace problems in PROD-12414.
Add jacoco.

Builds with jacoco now but I think it still needs tweaking.