Hive-4962 Fix eclipse templates broken from ASM changes (Yin Huai via egc)

Submitted by: Yin Huai	
Reviewed by: Edward Capriolo	


git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1508706 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4920 PTest2 handle Spot Price increases gracefully and improve rsync paralllelsim (Brock Noland via egc)

Submitted by:	Brock Noland
Reviewed by:	Edward Capriolo


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