Do not overwrite .java files during build. Blindfolded fix for TFS issue.
Merge branch 'master' into no-overwrite-javas to update with the latest changes (Ant-based generator)
Add missing variable declaration
Merge branch 'no-overwrite-javas'