Prepare master for 3.19 tag

config.ini

@@ -1,53 +1,25 @@
 ; section are between [] = [section]
 ; key = value
 ; to comment add ";" in front of the line
-;
-;
-; NOTE: You must add all your FreeSWITCH servers to the trusted ACLs
-;    if you are using zones!
-;
+[amqp]
+uri = "amqp://guest:guest@127.0.0.1:5672"
+
 [bigcouch]
 compact_automatically = true
 cookie = change_me
 ip = "127.0.0.1"
 port = 15984
-;username = "kazoo"
-;password = "supermegaexcellenttelephonyplatform"
+; username = "kazoo"
+; password = "supermegaexcellenttelephonyplatform"
 admin_port = 15986
 
-; Define your AMQPs and zones here
-[zone]
-name = zone_1
-amqp_uri = "amqp://guest:guest@127.0.0.1:5672"
-
-;[zone]
-;name = zone_2
-;amqp_uri = "amqp://guest:guest@127.0.0.2:5672"
-
-; Define your whistles here
 [whistle_apps]
-;host = apps001.2600hz.com
-zone = zone_1
 cookie = change_me
 
-;[whistle_apps]
-;host = apps002.2600hz.com
-;zone = zone_2
-;cookie = change_me
-
-; Define your ecallmgr's here
 [ecallmgr]
-;host = apps001.2600hz.com
-zone = zone_1
 cookie = change_me
 
-;[ecallmgr]
-;host = apps002.2600hz.com
-;zone = zone_2
-;cookie = change_me
-
 [log]
-syslog = debug
+syslog = info
 console = notice
 file = error
-

haproxy/haproxy.cfg

@@ -1,40 +1,39 @@
 global
-    log 127.0.0.1   local0
-    log 127.0.0.1   local1 notice
-    maxconn 4096
-    user haproxy
-    group haproxy
-    stats socket    /tmp/haproxy.sock mode 777
+        log 127.0.0.1   local0
+        log 127.0.0.1   local1 notice
+        maxconn 4096
+        user haproxy
+        group haproxy
+        stats socket    /tmp/haproxy.sock mode 777
 
 defaults
-    log global
-    mode http
-    option httplog
-    option dontlognull
-    option redispatch
-    option httpchk GET /
-    option allbackups
-    option http-server-close
-    maxconn 2000
-    retries 3
-    timeout connect 6000ms
-    timeout client 120000ms
-    timeout server 120000ms
-
+        log global
+        mode http
+        option httplog
+        option dontlognull
+        option redispatch
+        option httpchk GET /
+        option allbackups
+        maxconn 2000
+        retries 3
+        timeout connect 6000ms
+        timeout client 12000ms
+        timeout server 12000ms
+        
 listen bigcouch-data 127.0.0.1:15984
-    balance roundrobin
+  balance roundrobin
     server db1.zone1.mydomain.com 127.0.0.1:5984 check
     server db2.zone1.mydomain.com 127.0.0.2:5984 check
     server db3.zone2.mydomain.com 127.0.0.3:5984 check backup
     server db4.zone2.mydomain.com 127.0.0.4:5984 check backup
 
 listen bigcouch-mgr 127.0.0.1:15986
-    balance roundrobin
+  balance roundrobin
     server db1.zone1.mydomain.com 127.0.0.1:5986 check
     server db2.zone1.mydomain.com 127.0.0.2:5986 check
     server db3.zone2.mydomain.com 127.0.0.3:5986 check backup
     server db4.zone2.mydomain.com 127.0.0.4:5986 check backup
 
 listen haproxy-stats 127.0.0.1:22002
-    mode http
-    stats uri /
+  mode http
+  stats uri /

rabbitmq/rabbitmq.config

@@ -1,6 +1,6 @@
-[{rabbit, [{disk_free_limit, 5242880}
+[
+{rabbit, [{disk_free_limit, 5242880}
           ,{vm_memory_high_watermark, 0.8}
-          ,{hipe_compile, true}
           ,{loopback_users, []}
          ]},
 {rabbitmq_management_agent, [ {force_fine_statistics, false} ] }