These changes are needed for the G3 sync as we use a different version/settings of Typescript than on Github. closes #9701