merge -r1655:1701 from asterix_lsm_stabilization to asterix_lsm_stabilization_kisskys

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