Merge branch 'asterix_lsm_stabilization' of https://code.google.com/p/asterixdb into jarodwen/hotfix363