Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: 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: I214bb7d870a88953652fc344d9a3d27367c4526e