merge asterix_stabilization r335:377 and asterix_opentype r377:378

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