batman-adv: Merge bugfixes from 2018.4