Avoid a deadlock in LSM between the schema lock and the checkpoint lock.

refs #668
Merge branch 'develop' into fine-grained-durability