pkg/wait: move wait to pkg/wait
Merge pull request #1707 from xiang90/wait_pkg

pkg/wait: move wait to pkg/wait