Set up CLI before running growl watcher tests (fixes #361)
Merge branch 'release-3.6.x'