Merge pull request #4 from xtuple/master

Catch up.
issue #19606: Make sure lock mechanism works for Qt Client users.
Merge pull request #5 from xtuple/master

catch up.
Merge pull request #25 from jrogelstad/master

issue #19606: Fix problem with lock for qt users.