Merge pull request #4358 from plm/remove-rrd-path-triple-escape