Fix wait_for_hs bug when specifying --local-only
Merge pull request #124 from kkka/fix-wait_for_hs-bug

Fix wait_for_hs bug when specifying --local-only