batctl: Merge bugfixes from 2020.4