batman-adv: Merge bugfixes from 2021.2