Work around some mgr:forward accounting/reporting bugs #262

Job	Run time
CodeQL-tests	24m 4s
source-maintenance-tests	2m 49s
functionality-tests	18m 21s
build-tests(ubuntu-22.04,gcc,default)	5m 15s
build-tests(ubuntu-22.04,gcc,minimal)	4m 17s
build-tests(ubuntu-22.04,gcc,maximus)	6m 36s
build-tests(ubuntu-22.04,clang,default)	6m 26s
build-tests(ubuntu-22.04,clang,minimal)	5m 7s
build-tests(ubuntu-22.04,clang,maximus)	7m 16s
	1h 20m 11s

Provide feedback