Revert "reset but added freeze"

This reverts commit 45278b900071e6821dad6e21036f697b74febe05.
removed some libraries
stuff
ssstttuuuffff
upgraded stuff
run multiple trial invocations
stuff
Refactor HTTP server in test_hgpoller to stop correctly and quietly
Work around import order causing test failures

Importing misc reloads all modules.  Referring to symbols in other
modules with "from module import symbol" can get you stuck with old
copies of objects when reloading takes place.  Using "import module" and
referring to "module.symbol" avoids this issue.
fix one more place reloading hgpoller makes tests fail
test