merge back the fixes for issue285 and issue288: r1477:1478 and r1481:1482 from asterix_issue285

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1483 eaa15691-b419-025a-1212-ee371bd00084
17 files changed