This should improve test reliability for the unit tests so brokers don't
hang around after the end of a test on error. Also increase the surefire
re-run count to 3 times before failing.
(cherry picked from commit a083ff4d23e9ea0997efa5aa596ed5f1c3c6ee24)
This should help reduce failures from flaky tests and make the build
more reliable
(cherry picked from commit 1b9bd133fd2fe87a4779b7483a339a4fe6dd8c9f)