Migration: Corrected en-fr and fr-en mismatches.
Merge pull request #2909 from pjackson28/migrationcleanup

Migration: Corrected en-fr and fr-en mismatches.
Merge branch 'v3.0'