Forward port 2.3.11->2.3.12 DB upgrade

Signed-off-by: Bill Erickson <berick@esilibrary.com>