Simplify the test for whether or not we've locked the handle -- I
misread the code yesterday, and I'm not going to do it again.
Merge branch 'develop' into bulk-handles
Merge pull request #685 from wiredtiger/bulk-handles

minor code change (on the wrong branch)