--- /home/bf/bfr/root/upgrade/HEAD/origin-REL9_5_STABLE.sql	2016-05-03 11:56:10.411564126 -0400
+++ /home/bf/bfr/root/upgrade/HEAD/converted-REL9_5_STABLE-to-HEAD.sql	2016-05-03 11:57:47.976565246 -0400
@@ -240,8 +240,6 @@
 ALTER DATABASE pl_regression SET lc_time TO 'C';
 ALTER DATABASE pl_regression SET timezone_abbreviations TO 'Default';
 CREATE DATABASE regression WITH TEMPLATE = template0 OWNER = buildfarm;
-REVOKE ALL ON DATABASE regression FROM PUBLIC;
-REVOKE ALL ON DATABASE regression FROM buildfarm;
 GRANT ALL ON DATABASE regression TO buildfarm;
 GRANT CONNECT,TEMPORARY ON DATABASE regression TO PUBLIC;
 ALTER DATABASE regression SET lc_messages TO 'C';
@@ -249,8 +247,6 @@
 ALTER DATABASE regression SET lc_numeric TO 'C';
 ALTER DATABASE regression SET lc_time TO 'C';
 ALTER DATABASE regression SET timezone_abbreviations TO 'Default';
-REVOKE ALL ON DATABASE template1 FROM PUBLIC;
-REVOKE ALL ON DATABASE template1 FROM buildfarm;
 GRANT ALL ON DATABASE template1 TO buildfarm;
 GRANT CONNECT ON DATABASE template1 TO PUBLIC;
 
@@ -263,7 +259,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -296,16 +292,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -317,7 +303,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -7389,16 +7375,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -7410,7 +7386,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -8192,16 +8168,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -8213,7 +8179,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -26630,16 +26596,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -26651,7 +26607,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -26939,16 +26895,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -26960,7 +26906,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30132,16 +30078,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30153,7 +30089,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30349,13 +30285,17 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
+-- Name: dblink_connect_u(text); Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
+REVOKE ALL ON FUNCTION dblink_connect_u(text) FROM PUBLIC;
+
+
+--
+-- Name: dblink_connect_u(text, text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION dblink_connect_u(text, text) FROM PUBLIC;
 
 
 --
@@ -30370,7 +30310,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30410,16 +30350,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30431,7 +30361,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30471,16 +30401,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30492,7 +30412,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30675,16 +30595,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30696,7 +30606,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30747,16 +30657,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30768,7 +30668,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30794,16 +30694,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30815,7 +30705,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31966,16 +31856,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -31987,7 +31867,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32013,16 +31893,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -32034,7 +31904,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32276,16 +32146,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -32297,7 +32157,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32323,16 +32183,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -32344,7 +32194,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -34448,16 +34298,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -34469,7 +34309,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -34608,16 +34448,6 @@
 ALTER FUNCTION public.test2() OWNER TO buildfarm;
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -34629,7 +34459,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35730,16 +35560,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -35751,7 +35571,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35851,16 +35671,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -35872,7 +35682,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35953,16 +35763,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -35974,7 +35774,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36091,16 +35891,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -36112,7 +35902,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38270,16 +38060,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38291,7 +38071,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40941,16 +40721,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -40962,7 +40732,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41221,16 +40991,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -41242,7 +41002,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41297,16 +41057,6 @@
 ALTER TEXT SEARCH CONFIGURATION testcfg OWNER TO buildfarm;
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -41318,7 +41068,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41344,16 +41094,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -41365,7 +41105,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41405,16 +41145,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -41426,7 +41156,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41502,9 +41232,9 @@
 --
 
 COPY test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -42053,16 +41783,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42074,7 +41794,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -42182,16 +41902,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42203,7 +41913,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -42312,16 +42022,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42333,7 +42033,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -42373,16 +42073,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42394,7 +42084,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -42504,16 +42194,6 @@
 ALTER FUNCTION public.uuid_version_bits(uuid) OWNER TO buildfarm;
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42525,7 +42205,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -42551,16 +42231,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -42572,7 +42242,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -43468,16 +43138,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -43489,7 +43149,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -43522,16 +43182,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -43543,7 +43193,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -245826,9 +245476,9 @@
 --
 
 COPY test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -249355,25 +249005,12 @@
 
 ALTER TABLE rls_tbl_force ENABLE ROW LEVEL SECURITY;
 
---
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
 SET search_path = public, pg_catalog;
 
 --
 -- Name: my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_normal TO PUBLIC;
 
 
@@ -249381,9 +249018,6 @@
 -- Name: my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_secure TO PUBLIC;
 
 
@@ -249391,9 +249025,6 @@
 -- Name: my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -249401,9 +249032,6 @@
 -- Name: my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -249411,9 +249039,6 @@
 -- Name: my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE my_property_normal TO PUBLIC;
 
 
@@ -249421,9 +249046,6 @@
 -- Name: my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE my_property_secure TO PUBLIC;
 
 
@@ -249439,7 +249061,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.2
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -249472,16 +249094,6 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
