batctl: Merge bugfixes from v2017.4