cleanup merge hyracks_dev_next r847:977

git-svn-id: https://hyracks.googlecode.com/svn/branches/aggregators_dev_next@980 123451ca-8445-de46-9d55-352943316053