[backport] test: conflict backport (to 1.1)#17

openwisp-companion[bot] wants to merge 1 commit into1.1openwisp/bot-testing-ground:1.1from

backport/16-to-1.1-1771275479openwisp/bot-testing-ground:backport/16-to-1.1-1771275479Copy head branch name to clipboard