Merged hyracks_dev_next -r 601:1246

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