merged asterix_stabilization r1196:1212 into issue173 branch

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