Fixes issue #5222 misinterpretation of "or" in a string
(and added edge case test for bug with "or" in a string in blade templates)
Merge pull request #5224 from andyfleming/4.2

[4.2] bug fix— Fixes #5222
Fix tests.