Fixes leftover maintenance docking arm

Removes some remaining bits of the maintenance docking arm.
Merge remote-tracking branch 'upstream/dev' into mapfix
Merge pull request #7252 from mwerezak/mapfix

Fixes leftover maintenance docking arm