batman-adv: Merge bugfixes from 2020.2