batman-adv: Merge bugfixes from 2022.0