Add a "generated" header to grammar files (#929)

Also executed an import of the latest changes

Author: blakeembrey