Changes in some flaky tests to use dynamic ports
(cherry picked from commit 750e6cc)
Changes in some flaky tests to use dynamic ports
(cherry picked from commit e79d91f)