Merged r248:249 from trunk

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_storage_cleanup@252 123451ca-8445-de46-9d55-352943316053
24 files changed