Add configurability of lock table count option; increase default from 7 to 17