use static imports
expose locateExternal method and use it in ResourceWatcher to avoid using dispatcher explicitly
RequestHandlers are enabled by default only if Context is available
fix failing tests
Merge branch 'issue822' into 1.7.x