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