batctl: Merge bugfixes from 2021.0