CID-1249801 This should be a string comparison, not an object comparison
CID-1249800 Fix a coverity bug, but disable the code its used in as it
needs rethinking
Merge branch 'bugfix/CID-1249801'
Merge branch 'bugfix/CID-1249800'