Fix for #4406, #4291 -- add in renaming for reserved words #910

Job	Run time
build (macos-11, tool)	2m 4s
cpp-lib-build (macos-11, clang, ON)	1m 31s
build (macos-11, cpp)	27m 23s
cpp-lib-build (macos-11, clang, OFF)	1m 40s
build (macos-11, csharp)	12m 30s
cpp-lib-build (macos-11, gcc, ON)	1m 35s
build (macos-11, dart)	5m 42s
cpp-lib-build (macos-11, gcc, OFF)	1m 38s
build (macos-11, go)	5m 55s
cpp-lib-build (ubuntu-20.04, clang, ON)	1m 18s
build (macos-11, java)	2m 27s
cpp-lib-build (ubuntu-20.04, clang, OFF)	1m 36s
build (macos-11, javascript)	2m 39s
cpp-lib-build (ubuntu-20.04, gcc, ON)	2m 15s
build (macos-11, typescript)	21m 37s
cpp-lib-build (ubuntu-20.04, gcc, OFF)	2m 11s
cpp-lib-build (windows-2022, clang, ON)	8m 14s
build (macos-11, php)	2m 35s
cpp-lib-build (windows-2022, clang, OFF)	12m 35s
build (macos-11, python3)	2m 14s
build (ubuntu-20.04, tool)	1m 13s
cpp-lib-build (windows-2022, cl)	7m 9s
build (ubuntu-20.04, cpp)	19m 35s
build (ubuntu-20.04, csharp)	9m 6s
build (ubuntu-20.04, dart)	6m 10s
build (ubuntu-20.04, go)	4m 6s
build (ubuntu-20.04, java)	1m 27s
build (ubuntu-20.04, javascript)	2m 22s
build (ubuntu-20.04, typescript)	16m 8s
build (ubuntu-20.04, php)	1m 49s
build (ubuntu-20.04, python3)	1m 41s
build (windows-2022, tool)	2m 40s
build (windows-2022, cpp)	35m 44s
build (windows-2022, csharp)	12m 48s
build (windows-2022, dart)	8m 18s
build (windows-2022, go)	9m 29s
build (windows-2022, java)	3m 1s
build (windows-2022, javascript)	4m 11s
build (windows-2022, typescript)	36m 17s
build (windows-2022, php)	2m 42s
build (windows-2022, python3)	2m 49s
	5h 8m 24s

Provide feedback