Merged 500:541 from trunk

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_scheduling@542 123451ca-8445-de46-9d55-352943316053
329 files changed