HBASE-8809 Addendum to correctly hand versions in raw scans aswell (Jesse and LarsH)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1500217 13f79535-47bb-0310-9956-ffa450edef68
HBASE-8809 test fix

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1500232 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd