am 3801a12c: Merge "redo to use PollingCheck - remove Thread.sleep" into jb-dev

* commit '3801a12c71dc7f37820a9f2e2377075e13ad269a':
  redo to use PollingCheck - remove Thread.sleep