HBASE-12012. Improve cancellation for the scan RPCs (patch from master; had to resolve some conflicts)