Merge pull request #1042 from starius/sweepbatcher-fix-race-addsweeps #2719

Job	Run time
RPC compilation check	1m 33s
SQL compilation check	8s
go mod check	9m 48s
run unit tests	18m 44s
build and lint code	4m 55s
verify that auto-generated documentation is up-to-date	36s
	35m 44s

Provide feedback