Merge "Make DbQueryUtils.escapeLikeValue() escape escape chars."