HIVE-4865 - HiveLockObjects: Unlocking retries/times out when query contains ":" (Gunther Hagleitner via Brock Noland)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1504225 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4873 Sort candidate functions in case of UDFArgumentException (Xuefu Zhang via egc)

Submitted by:	Xuefu Zhang
Reviewed by:	Edward Capriolo


git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1504361 13f79535-47bb-0310-9956-ffa450edef68