refs #667 Ensure that setParameter succeeds when setting lockTimeout
Merge branch 'bugfixes/tokumx-1.3'