Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I403977a4b08e4ac6ea297be169bdee9e6d5036cc