FIX: Make db_disconnect work more reliably.
FIX: Make db_disconnect work more reliably.

NSLS-II/filestore,danielballan/filestore,ericdill/fileStore,stuwilkins/filestore,danielballan/filestore,ericdill/databroker,tacaswell/filestore,ericdill/fileStore,stuwilkins/filestore,ericdill/databroker