HBASE-11667 Comment ClientScanner logic for NSREs.
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94