Update ruleutils_95 with latest PostgreSQL changes
Update ruleutils_95 with latest PostgreSQL changes

Hand-applied changes from a diff I generated between 9.5.0 and 9.5.4.

citusdata/citus,citusdata/citus,citusdata/citus,citusdata/citus,citusdata/citus