SHDP-189 Fix slow app state wait, tidy javadocs

Adding break label order to jump out from inner loop.