Merge "Revert "Make wfGetDB() return a MaintainableDBConnRef instance""