various fixups to rebase
fixup! replace hardcoded batadv vlanid=11 with %N1 template, to allow multiple L2 clouds to coexist automatically