HIVE-4942 : Fix eclipse template files to use correct datanucleus libs (Yin Huai via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507439 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4892: PTest2 cleanup after merge (remove empty files)

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