merge -r1055:1282 (merging from asterix_stabilization to asterix_lsm_stabilization)

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