reformat
fix typo
more unit test fixes for JDK 7
Merge branch '1.12'