Make sure we format error messages on definitions import correctly.
Merge bug26197
stable to default