Another round of fixing -Wextra-semi-stmt warnings #4079

Job	Run time
Windows MSVC CMake REL TS	9m 6s
Windows MSVC CMake DBG TS	5m 12s
Windows MSVC CMake REL	15m 32s
Windows MSVC CMake DBG	22m 13s
Ubuntu gcc CMake REL TS	5m 22s
Ubuntu gcc CMake DBG TS	4m 17s
Ubuntu gcc CMake REL	11m 7s
Ubuntu gcc CMake DBG	8m 57s
Ubuntu gcc Autotools REL TS	6m 11s
Ubuntu gcc Autotools DBG TS	5m 38s
Ubuntu gcc Autotools REL	16m 43s
Ubuntu gcc Autotools DBG	21m 5s
Ubuntu gcc Autotools parallel (build only) REL TS	6m 24s
Ubuntu gcc Autotools parallel (build only) DBG TS	5m 55s
Ubuntu gcc Autotools parallel (build only) REL	7m 31s
Ubuntu gcc Autotools parallel (build only) DBG	7m 7s
MacOS Clang CMake REL TS	5m 3s
MacOS Clang CMake DBG TS	2m 32s
MacOS Clang CMake REL	7m 35s
MacOS Clang CMake DBG	7m 56s
Ubuntu gcc Autotools v1.6 default API (build only) DBG	9m 45s
Ubuntu gcc Autotools v1.8 default API (build only) DBG	10m 28s
Ubuntu gcc Autotools v1.10 default API (build only) DBG	9m 21s
Ubuntu gcc Autotools v1.12 default API (build only) DBG	12m 44s
Ubuntu gcc Autotools v1.14 default API (build only) DBG	9m 2s
Ubuntu gcc Autotools no deprecated symbols (build only) DBG	9m 29s
Ubuntu gcc Autotools -Werror (build only) DBG	7m 18s
Ubuntu gcc Autotools -Werror (build only) REL	8m 15s
Ubuntu gcc Autotools parallel -Werror (build only) DBG	7m 20s
Ubuntu gcc Autotools parallel -Werror (build only) REL	6m 32s
	4h 31m 40s

Provide feedback