Merge "Fix default "srvCache" BagOStuff in DatabaseBase"