fix for bug 19866224, reverse the String equals check
Merge branch 'fix_BUG19866224_branch' into 'master'

Fix bug19866224 branch