Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev