Added one missed change to conventions exception messages
Merge branch 'release-6.0.0-rc1'