update unit test for async resourceWatcher check & update javadoc
Merge branch 'issue822' into 1.7.x
remove unnecessary method
Merge branch 'issue822' into 1.7.x