WFS: take correctly into account XML comments in filters (#4986)
Merge remote-tracking branch 'upstream/master' into sld_outlinewidth_support