merge changes from asterix_stabilization_yfix

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