Fix mailmap entries for @jasongrout and @SylvainCorlay
Merge pull request #6522 from fperez/mailmap-fix

Fix mailmap entries for @jasongrout and @SylvainCorlay