fix bz894976 - dont run connections on old container
share db connection logic
Merge pull request #1272 from rajatchopra/master

Merged by openshift-bot
Merge pull request #1276 from danmcp/master

Share db connection logic