DRILL-364: Incrporate JinFeng's patch
DRILL-356: Support for date and time data types