merged func_type_check back to stabilization

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