Use Container contract.
Prettiness.
Merge pull request #6280 from franzliedke/patch-11

[5.0] Use Container Contract In Database Connection Factory