Update test-library dependencies. Update unit test maven plugin.
Cleanups required to make checkstyle checks pass.
merge in cleanups (checkstyle and more) from branch to master