batman-adv: Merge bugfixes from 2018.1-maint 2018-06-03