Merged revision(s) 1588871, 1588890 from lucene/dev/branches/branch_4x: LUCENE-5612: fix NativeFSLockFactory to pass LockStressTest