Fix various MAINTAINERS format inconsistencies Upstream-commit: e8f8f1c72963e1c9511ea6aedcd8a1f53c5da277 Component: engine