Merge from asterix_stabilization r1176:1182

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