What problem does this code solve?
Cleanup minor issues after #854 and #856 commits. No code changes.

Does the code still compile with Java6?
Yes

Risks
Low

Changes to the API?
No

Will this require a new release?
No

Should the documentation be updated?
No

Does it break the unit tests?
No

Was any code refactored in this commit?
No

Review status
APPROVED - by myself

Note
Reverting the change to pom.xml may result in a build warning:
[WARNING] bootstrap class path not set in conjunction with -source 8

Starting 3-day comment window