batman-adv: Merge bugfixes from 2017.4