merging trunk changes with IIS-CDH-5.3.0 branch, disabling hive-builtins which is unavailable in CDH5