Merged revision(s) 1589397 from lucene/dev/branches/branch_4x:
Merged revision(s) 1589394 from lucene/dev/trunk:
LUCENE-5626: Fix bug in SimpleFSLockFactory's obtain() that sometimes throwed IOException (ERROR_ACESS_DENIED) on Windows if the lock file was created concurrently

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1589811 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1589814 from lucene/dev/branches/branch_4x:
Merged revision(s) 1589813 from lucene/dev/trunk:
LUCENE-5626: Move changes entry (merge props only)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1589824 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6011: ComplexPhraseQuery hashCode/equals fix for inOrder

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1589826 13f79535-47bb-0310-9956-ffa450edef68
fix TestAllAnalysersHaveFactories to actually work, and add missing SPI entry

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1589840 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1589872 from lucene/dev/branches/branch_4x:
Merged revision(s) 1589870 from lucene/dev/trunk:
LUCENE-5630: Fix TestAllAnalyzersHaveFactories to correctly check for existence of class and corresponding Map<String,String> ctor

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_8@1589874 13f79535-47bb-0310-9956-ffa450edef68
pulling in changes from solr2052 on trunk