HIVE-7589 : Some fixes and improvements to statistics annotation rules (Prasanth J via Ashutosh Chauhan)

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