batman-adv: Merge bugfixes from 2019.0