Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  fixup!: docker: Enable reruning tests without bringing down setup
  docker: Enable reruning tests without bringing down setup
  docker: Add support for "--preserve" option

Change-Id: I68cf619bb6f633bc758fc57dd855dd23f02ecae6