Don't entity-encode URLs used on attributes: libxml2 does this for us. Refs #4622
Merge branch 'branch-6-2'