Apply pgsql notice test fixes to PHP-5.5
Merge branch 'PHP-5.5'