Merge branch 'clocksource.2021.08.16a' into HEAD

clocksource.2021.08.16a: Clocksource-watchdog updates.