Misc missed things from previous merges #4152

Job	Run time
Windows MSVC CMake REL TS	9m 31s
Windows MSVC CMake DBG TS	7m 12s
Windows MSVC CMake REL	18m 6s
Windows MSVC CMake DBG	22m 19s
Ubuntu gcc CMake REL TS	4m 4s
Ubuntu gcc CMake DBG TS	3m 42s
Ubuntu gcc CMake REL	11m 24s
Ubuntu gcc CMake DBG	8m 19s
Ubuntu gcc Autotools REL TS	8m 9s
Ubuntu gcc Autotools DBG TS	5m 24s
Ubuntu gcc Autotools REL	15m 56s
Ubuntu gcc Autotools DBG	17m 2s
Ubuntu gcc Autotools parallel (build only) REL TS	6m 9s
Ubuntu gcc Autotools parallel (build only) DBG TS	6m 51s
Ubuntu gcc Autotools parallel (build only) REL	9m 19s
Ubuntu gcc Autotools parallel (build only) DBG	7m 26s
MacOS Clang CMake REL TS	4m 23s
MacOS Clang CMake DBG TS	2m 12s
MacOS Clang CMake REL	8m 56s
MacOS Clang CMake DBG	10m 40s
Ubuntu gcc Autotools v1.6 default API (build only) DBG	11m 15s
Ubuntu gcc Autotools v1.8 default API (build only) DBG	9m 22s
Ubuntu gcc Autotools v1.10 default API (build only) DBG	8m 49s
Ubuntu gcc Autotools v1.12 default API (build only) DBG	11m 12s
Ubuntu gcc Autotools no deprecated symbols (build only) DBG	9m 1s
Ubuntu gcc Autotools -Werror (build only) DBG	7m 34s
Ubuntu gcc Autotools -Werror (build only) REL	8m 4s
Ubuntu gcc Autotools parallel -Werror (build only) DBG	6m 6s
Ubuntu gcc Autotools parallel -Werror (build only) REL	6m 1s
	4h 24m 28s

Provide feedback