Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: 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: Idd1fa46aa6e75ab65a7edc5f90442cc6f8ddc6b6