When searching for pages to merge, don't walk up into a locked page: that can race with eviction.

refs #909
Merge branch 'develop' into new-split

Conflicts:
	src/btree/bt_evict.c
	src/btree/bt_walk.c