merge r997:1019 from asterix_stabilization to asterix_stabilization_yfix

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