PRD-5159 - Fixing overly assertive test. Complex text is platform dependent.
PRD-5159 - Fixing bug on multi-line caught by tests, Fixing overly assertive test. Complex text is platform dependent.
Merge pull request #436 from tmorgner/PRD-5159

Prd 5159
Merge remote-tracking branch 'upstream/master'