Merged revision(s) 1595257 from lucene/dev/branches/branch_4x:
Merged revision(s) 1595255 from lucene/dev/trunk:
Disable our lock factory tests, if clover is enabled (the exact reason is unclear, but it looks like Clover gets a deadlock if instrumented code is run inside the ANT JVM)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1595258 13f79535-47bb-0310-9956-ffa450edef68