Merge pull request #1 from jhartlaub/shark-0.9-csd

Backport of HIVE-3090 fix (from hive 0.10) to fix timestamp handling.