Merge fullstack_rsd_fixes from r3309:r3314.

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