This adds selected fixes for graphite2 from the upstream repository,
including a fix for CVE-2017-5436.  I intend to push it soon, after some
light testing on my system.

     Mark