Skip galaxy.tools.watcher test if watchdog unavailable.
Instead of failing.
Attempt fix of test/unit/test_lazy_process.py which transiently fails.
Merge next-stable.