Merge in latest PostgreSQL ruleutils changes

Upstream added two new external functions, but we don't modify either,
so this merge is a no-op as far as textual changes are concerned; it
serves only to mark us as up to date with 9.3.6 and 9.4.1.