Merge branch 'trunk-gd' of https://github.com/griddynamics/hive into fb-HIVE-4779-trunk-gd

Conflicts:
	ql/src/java/org/apache/hadoop/hive/ql/udf/UDFUnixTimeStamp.java