Merge branch 'salsubaiee/asterix_lsm_stabilization_issue_328' into asterix_lsm_stabilization. (Code reviewed by Zack).