CMSMain assertion fail due to escaping

Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
Merge remote-tracking branch 'origin/3.0' into 3.1