Cleanup mailmap, and update authors Upstream-commit: ff61d127fe8f39ed1bd888e4dbd3d8c14efc1a03 Component: engine