HIVE-4541 : Run check-style on the branch and fix style issues. (Jitendra Nath Pandey via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/vectorization@1509425 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4541 : Deleting the removed file from patch

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