Check in some updates I made to this ages ago which are at least still
partially applicable. This does at least remove some mutex flags that
were obsoleted a long, long time ago as well as rename the lockmgr section
to be more generic.