Loosen regex to allow for quoting quirk on Ubuntu 10.x
Tighten up regex a bit
Merge pull request #10176 from cachedout/refix-postgres-tests

Refix postgres tests