Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix the version of postgresql used in the test container
  Factor creation of test container out to a common method

Change-Id: I324887b6651714cbc3537ebfdcfac33c22f0b26c