Merge fullstack_lsm_staging r3309:r3313.

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