Remove phrases.cfg.
Removed grammar.h
Merge with Trunk Revision 10794.
Merge branch 'master' into multilock