batman-adv: Merge bugfixes from 2023.2