Merged asterix_stabilization_algebricks_cleanup -r 221:232

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