Refactor loop in test harness w.r.t. Catalog Version Mismatch

[tedyu]

In test code, we have

      for (int i = 0; i < 2; i++) {
        try {
...
        } catch (Exception e) {
          if (e.toString().contains("Catalog Version Mismatch: A DDL occurred while processing")) {
            continue;
          } else {
            throw e;
          }
        }

As @bmatican pointed out,

there's no guarantee that the 2nd iteration will actually work

  ie: if the master takes a couple of seconds to initialize, in say TSAN, then we'll be failing the scoped leader lock check over and over in that period

This issue is to refactor such formation to increase the retry count while limiting the total duration.