merge from asterix_stabilization r1199 through r1240

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