Add target/test-classes to test classpath.

Also fix some whitespace.
Merge pull request #2995 from bpindelski/12537_test-compile

Fix #12537: Add target/test-classes to test classpath.