merge from asterix_stabilization_issue_257

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