Merge "Limit number of in-memory db connections to 1 per pool" into oc-mr1-dev