Merged asterix_stabilization -r 1189:1249

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