Allow for Local Classpath classloader on JUnit tests.
Merge remote-tracking branch 'origin/master'
Updated an interface signature for framework change.