Merge branch 'issue822' into 1.7.x
Merge branch 'issue822' into 1.7.x
Merge branch 'issue822' into 1.7.x
increase coverage of ResourceWatcherRequestHandler
Merge branch 'testCoverageIncrease' into 2.0.x