Issue #3128746 by mondrake, longwave, dww: Replace assertions involving calls to strpos() with more accurate string assertions (cherry picked from commit 4d02fe7c)