HIVE-3810 : HiveHistory.log need to replace \r with space before writing Entry.value to historyfile (Mark Grover via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1500991 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4812 : Logical explain plan (Gunther Hagleitner V via Navis)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1501036 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk