1) merge from asterix_lsm_stabilization 2) added properties to asterix configuration xml following appends to google doc