Merge "Disable PHPUnit tests that fail under postgres"