Merge branch 'stable-3.3' * stable-3.3: 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: Icff7f4ef70ae15d329fbaf453bb7382b73844ebd