Follow-on to b50768142745dc4bfd8a9460c7490ddd00e3b06a - add a default
value for lock_timeout so that folks who get the latest code but don't
run the upgrader don't get burned by a SQL error.
Merge branch 'master' into 3.0.x
Merge branch '3.0.x' of github.com:gallery/gallery3 into 3.0.x