Remove passwd from test configurations

As the parameter will be removed in 2.3, the test configurations need to
be updated.

maxscale-system-test/cnf/maxscale.cnf.template.add_server

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server2,server3,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [CLI]
 type=service
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.add_service

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server2,server3,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [CLI]
 type=service
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [RW Split Listener]
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Master]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.alter_router

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 detect_standalone_master=false
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,14 +26,14 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [SchemaRouter]
 type=service
 router=schemarouter
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW-Split-Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.auroramon

@@ -9,7 +9,7 @@ type=monitor
 module=auroramon
 servers=server1,server2,server3,server4
 user=skysql
-passwd=skysqlrds
+password=skysqlrds
 monitor_interval=1000
 
 # Services
@@ -19,7 +19,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=skysql
-passwd=skysqlrds
+password=skysqlrds
 
 [CLI]
 type=service

maxscale-system-test/cnf/maxscale.cnf.template.avro

@@ -10,7 +10,7 @@ type=service
 router=binlogrouter
 #servers=master
 user=skysql
-passwd=skysql
+password=skysql
 version_string=5.6.15-log
 #router_options=server-id=3,user=repl,password=repl,master-id=1
 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1
@@ -51,7 +51,7 @@ group_trx=1
 group_rows=1
 avrodir=/var/lib/maxscale/avro/
 user=skysql
-passwd=skysql
+password=skysql
 
 [avro-listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.avro_compression

@@ -7,7 +7,7 @@ log_info=1
 type=service
 router=binlogrouter
 user=skysql
-passwd=skysql
+password=skysql
 version_string=5.6.15-log
 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1
 
@@ -38,7 +38,7 @@ group_trx=1
 group_rows=1
 avrodir=/var/lib/maxscale/avro/
 user=skysql
-passwd=skysql
+password=skysql
 
 [avro-listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bad_pers

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 max_slave_connections=1
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 ssl=required
@@ -30,7 +30,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 ssl=required
 ssl_cert=/###access_homedir###/certs/server-cert.pem
 ssl_key=/###access_homedir###/certs/server-key.pem
@@ -43,7 +43,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 ssl=required
 ssl_cert=/###access_homedir###/certs/server-cert.pem
 ssl_key=/###access_homedir###/certs/server-key.pem

maxscale-system-test/cnf/maxscale.cnf.template.batchinsert

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -14,7 +14,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -24,7 +24,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc

@@ -6,7 +6,7 @@ log_warning=1
 type=service
 router=binlogrouter
 user=skysql
-passwd=skysql
+password=skysql
 version_string=5.6.15-log
 #router_options=server-id=3,user=repl,password=repl,master-id=1
 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_cbc

maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr

@@ -6,7 +6,7 @@ log_warning=1
 type=service
 router=binlogrouter
 user=skysql
-passwd=skysql
+password=skysql
 version_string=5.6.15-log
 #router_options=server-id=3,user=repl,password=repl,master-id=1
 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_ctr

maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl

@@ -7,7 +7,7 @@ type=service
 router=binlogrouter
 #servers=master
 user=repl
-passwd=repl
+password=repl
 version_string=5.6.15-log
 
 

maxscale-system-test/cnf/maxscale.cnf.template.bug359

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
@@ -15,7 +15,7 @@ router= readwritesplit
 router_options=slave
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug471

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -37,7 +37,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -45,7 +45,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug479

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=non existing filter | не существуюший фильтер
 
 [Read Connection Router Slave]
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug493

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug495

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4,server5
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug526

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=testfilter
 
 [Read Connection Router Slave]
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug539

@@ -8,7 +8,7 @@ module=mysqlmon
 detect_replication_lag=1
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 
 [hints]
 type=filter
@@ -23,7 +23,7 @@ max_slave_connections=100%
 use_sql_variables_in=master
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=hints
 
 [Read Connection Router Slave]
@@ -32,7 +32,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -40,7 +40,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug547

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug567

@@ -9,7 +9,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -18,7 +18,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -28,7 +28,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -36,7 +36,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug571

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [regex]
 type=filter
@@ -30,7 +30,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -43,7 +43,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -51,7 +51,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug585

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [regex]
 type=filter
@@ -26,7 +26,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -42,7 +42,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -50,7 +50,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug587

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -36,7 +36,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -44,7 +44,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug587_1

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -36,7 +36,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -44,7 +44,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug601

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug620

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 enable_root_user=true
 
 [Read Connection Router Slave]
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug643

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
@@ -16,7 +16,7 @@ servers=server1,server2,server3,server4
 max_slave_connections=100%
 use_sql_variables_in=all
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=duplicate
 
 [duplicate]
@@ -31,7 +31,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug643_1

@@ -10,7 +10,7 @@ servers=server1,server2,server3,server4
 detect_replication_lag=1
 detect_stale_master=1
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -52,7 +52,7 @@ max_slave_connections=100%
 use_sql_variables_in=all
 #use_sql_variables_in=master
 user=maxskysql
-passwd=skysql
+password=skysql
 #filters=typo|qla|regex|hints|regex|hints
 #enable_root_user=1
 filters=duplicate
@@ -64,7 +64,7 @@ servers=server1,server2,server3,server4
 max_slave_connections=100%
 use_sql_variables_in=all
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=qla|tests|hints
 
 
@@ -74,7 +74,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -82,7 +82,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug645

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW_Router]
 type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.1-OLD-Bored-Mysql
 filters=DuplicaFilter
 
@@ -23,7 +23,7 @@ type=service
 router=readwritesplit
 servers=server1,server3,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [DuplicaFilter]
 type=filter
@@ -48,7 +48,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -56,7 +56,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug645_1

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW_Router]
 type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.1-OLD-Bored-Mysql
 filters=DuplicaFilter
 
@@ -23,7 +23,7 @@ type=service
 router=readwritesplit
 servers=server3,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [DuplicaFilter]
 type=filter
@@ -48,7 +48,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -56,7 +56,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug648

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 #filters=TEE
 
 [TEE]
@@ -28,7 +28,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=TEE
 
 [Read Connection Router Master]
@@ -37,7 +37,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=TEE
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.bug650

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW_Router]
 type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.1-OLD-Bored-Mysql
 filters=DuplicaFilter
 
@@ -23,7 +23,7 @@ type=service
 router=readwritesplit
 servers=server3,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [DuplicaFilter]
 type=filter
@@ -48,7 +48,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -56,7 +56,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug657

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=TEE
 
 [Read Connection Router Master]
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=TEE
 
 [TEE]

maxscale-system-test/cnf/maxscale.cnf.template.bug662

@@ -9,7 +9,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 backend_connect_timeout=1
@@ -21,7 +21,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug664

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW_Router]
 type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.1-OLD-Bored-Mysql
 filters=DuplicaFilter
 
@@ -23,7 +23,7 @@ type=service
 router=readwritesplit
 servers=server3,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [DuplicaFilter]
 type=filter
@@ -48,7 +48,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -56,7 +56,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug670

@@ -7,7 +7,7 @@ module=mysqlmon
 monitor_interval=10000
 servers=server1,server2,server3,server4
 user=skysql
-passwd=skysql
+password=skysql
 
 [hints]
 type=filter
@@ -44,7 +44,7 @@ max_slave_connections=100%
 use_sql_variables_in=all
 
 user=skysql
-passwd=skysql
+password=skysql
 filters=typo|qla|regex|hints|regex|hints
 enable_root_user=1
 
@@ -55,7 +55,7 @@ servers=server1,server2
 max_slave_connections=100%
 use_sql_variables_in=all
 user=skysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router]
 type=service
@@ -63,7 +63,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2
 user=skysql
-passwd=skysql
+password=skysql
 filters=duplicate
 
 [CLI]
@@ -100,7 +100,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug673

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 backend_connect_timeout=1
 
@@ -16,7 +16,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug694

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 use_sql_variables_in=all
 
 [Read Connection Router Slave]
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug705

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug711

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 use_sql_variables_in=all
 
@@ -24,7 +24,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug718

@@ -7,7 +7,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -15,7 +15,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -23,7 +23,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 
 [RW Split Router Galera]
@@ -31,7 +31,7 @@ type=service
 router= readwritesplit
 servers=g_server1, g_server2, g_server3, g_server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.bug730

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 filters=MySetOptionFilter
 
@@ -31,7 +31,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=MySetOptionFilter
 
 [Read Connection Router Master]
@@ -40,7 +40,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=MySetOptionFilter
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -14,7 +14,7 @@ type=service
 router=readwritesplit
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options=slave
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.cache_basic

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -17,7 +17,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -25,7 +25,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Cache
 
 [Read Connection Listener Slave]

maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime

@@ -13,7 +13,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -30,7 +30,7 @@ type=service
 router= readwritesplit
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Cache
 
 [RWS-Listener]

maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl

@@ -13,7 +13,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -27,7 +27,7 @@ type=service
 router= readwritesplit
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Cache
 
 [RWS-Listener]

maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -27,7 +27,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 filters=ccrfilter
@@ -46,7 +46,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener
@@ -62,7 +62,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Master]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.check_backend

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 
 [Galera Monitor]
@@ -15,7 +15,7 @@ type=monitor
 module=galeramon
 servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 root_node_as_master=false
 
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [RW Split Router Galera]
@@ -32,7 +32,7 @@ type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [Read Connection Router Slave]
@@ -41,7 +41,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -49,7 +49,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.config_reload

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [CLI]
 type=service
@@ -24,7 +24,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.connection_limit

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -17,7 +17,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 max_connections=10
@@ -28,7 +28,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_connections=25
 
 [Read Connection Router Master]
@@ -37,7 +37,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_connections=20
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.fwf

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=100
 
 [Database Firewall]
@@ -22,7 +22,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Database Firewall
 
 [Read Connection Router Slave]
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=slave
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.fwf_action

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [server1]
@@ -22,7 +22,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=blacklist
 
 [readconn-blacklist-listener]
@@ -46,7 +46,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=whitelist
 
 [readconn-whitelist-listener]
@@ -70,7 +70,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=ignore
 
 [readconn-ignore-listener]

maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [server1]
@@ -22,7 +22,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=whitelist
 
 [readconn-whitelist-listener]

maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging

@@ -12,7 +12,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [readconn]
@@ -20,7 +20,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=ignore
 
 [readconn-listener]

maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax

@@ -7,7 +7,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Database Firewall
 
 [Read Connection Listener Slave]

maxscale-system-test/cnf/maxscale.cnf.template.galera

@@ -6,7 +6,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 root_node_as_master=false
 
@@ -15,7 +15,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681

@@ -7,9 +7,9 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3
 #user=maxmon
-#passwd=maxpwd
+#password=maxpwd
 user=maxskysql
-passwd=skysql
+password=skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -17,9 +17,9 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3
 #user=maxpriv
-#passwd=maxpwd
+#password=maxpwd
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=MyLogFilter
 version_string=MariaDBEC-10.0.14
 localhost_match_wildcard_host=1
@@ -33,9 +33,9 @@ router=readconnroute
 router_options=synced
 servers=server1,server2,server3
 #user=maxpriv
-#passwd=maxpwd
+#password=maxpwd
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Listener Slave]
 type=listener
@@ -49,7 +49,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.galera.weight

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 use_priority=true
 root_node_as_master=false
 
@@ -19,7 +19,7 @@ weightby=serversize_rws
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 max_slave_connections=1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router]
 type=service
@@ -28,7 +28,7 @@ router_options=synced
 servers=server1,server2,server3,server4
 weightby=serversize
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 root_node_as_master=false
 
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.galera_priority

@@ -9,7 +9,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 use_priority=true
 monitor_interval=1000
 root_node_as_master=false
@@ -19,7 +19,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper

@@ -9,7 +9,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -23,7 +23,7 @@ max_slave_connections=100%
 use_sql_variables_in=master
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=gatekeeper
 
 [CLI]

maxscale-system-test/cnf/maxscale.cnf.template.hartmut

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=500
 detect_replication_lag=1
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 max_slave_replication_lag=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.hints

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -18,7 +18,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -31,7 +31,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.hints2

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server2,server3,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [hints]
 type=filter
@@ -18,7 +18,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -38,7 +38,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.insertstream

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [insertstream]
@@ -18,7 +18,7 @@ type=service
 router=readconnroute
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=insertstream
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 root_node_as_master=false
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.5.5-10.0.0-mxs
 
 [Read Connection Router Slave]
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.5.5-10.0.0-mxs
 
 [Read Connection Router Master]
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=5.5.5-10.0.0-mxs
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 detect_standalone_master=false
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 version_string=10.2-server1
@@ -27,7 +27,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server1
 
 [Read Connection Router Master]
@@ -36,7 +36,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server1
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 detect_standalone_master=false
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 version_string=10.2-server2
@@ -27,7 +27,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server2
 
 [Read Connection Router Master]
@@ -36,7 +36,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server2
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000

@@ -6,7 +6,7 @@ type=monitor
 module=mariadbmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 detect_standalone_master=false
@@ -17,7 +17,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 version_string=10.2-server1
@@ -28,7 +28,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server1
 
 [Read Connection Router Master]
@@ -37,7 +37,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server1
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001

@@ -6,7 +6,7 @@ type=monitor
 module=mariadbmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 detect_standalone_master=false
@@ -17,7 +17,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 version_string=10.2-server2
@@ -28,7 +28,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server2
 
 [Read Connection Router Master]
@@ -37,7 +37,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 version_string=10.2-server2
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.kerberos

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.lag

@@ -8,7 +8,7 @@ module=mysqlmon
 servers= server1, server2,server3  ,server4
 detect_replication_lag=1
 user=maxskysql
-passwd= skysql
+password= skysql
 backend_connect_timeout=10
 backend_read_timeout=10
 backend_write_timeout=10
@@ -23,7 +23,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 use_sql_variables_in=all
 router_options=slave_selection_criteria=LEAST_BEHIND_MASTER
@@ -37,7 +37,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -45,7 +45,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -24,7 +24,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load_galera

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10

@@ -7,7 +7,7 @@ type=monitor
 module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load_pers1

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -24,7 +24,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.load_pers10

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 max_slave_connections=100%
 router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS
 
@@ -24,7 +24,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -32,7 +32,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.local_address

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.longblob

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 backend_connect_timeout=10
 backend_read_timeout=10
@@ -17,7 +17,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 max_slave_connections=1
 
@@ -27,7 +27,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -35,7 +35,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 backend_connect_timeout=10
 backend_read_timeout=10
@@ -17,7 +17,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 max_slave_connections=1
 #filters=duplicate|hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall
@@ -31,7 +31,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener
@@ -160,7 +160,7 @@ type=monitor
 module=galeramon
 servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=100
 root_node_as_master=false
 
@@ -169,7 +169,7 @@ type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [RW Split Listener Galera]

maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 filters=Masking
 
 [RW Split Listener]

maxscale-system-test/cnf/maxscale.cnf.template.master_only

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router= readwritesplit
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.maxinfo

@@ -5,7 +5,7 @@ threads=4
 type=service
 router=maxinfo
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 
 [Maxinfo SQL Listener]
 type=listener
@@ -24,7 +24,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 monitor_interval=10000
 
 [RW Split Router]
@@ -32,7 +32,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -42,7 +42,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -50,7 +50,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql

@@ -30,14 +30,14 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [Maxinfo]
 type=service
 router=maxinfo
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 # Added here to allow users to be fetched from the backend server
 servers=server1
 
@@ -52,7 +52,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -26,7 +26,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.maxrows

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 filters=MaxRows
@@ -27,7 +27,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -35,7 +35,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mm

@@ -7,7 +7,7 @@ type=monitor
 module=mmmon
 servers= server1, server2
 user=maxskysql
-passwd= skysql
+password= skysql
 detect_stale_master=0
 monitor_interval=1000
 
@@ -16,7 +16,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [Read Connection Router Slave]
@@ -25,7 +25,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1, server2, server3, server4
 user=maxskysql
-passwd= skysql
+password= skysql
 detect_stale_master=0
 monitor_interval=1000
 multimaster=true
@@ -17,7 +17,7 @@ type=service
 router= readwritesplit
 servers=server1, server2, server3, server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [Read Connection Router Slave]
@@ -26,7 +26,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -34,7 +34,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs1045

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 detect_stale_master=false
 script=/bin/sh -c "echo hello world!"
@@ -18,7 +18,7 @@ type=service
 router= readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
 
@@ -28,7 +28,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -36,7 +36,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs1123

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 detect_stale_master=false
 
@@ -16,7 +16,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 connection_timeout=60
 
 [Read Connection Router Slave]
@@ -25,7 +25,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -33,7 +33,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs118

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [MySQL Monitor 1]
 type=monitor
 module=galeramon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 root_node_as_master=false
 
 [RW Split Router]
@@ -22,7 +22,7 @@ type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
 [Read Connection Router Slave]
@@ -31,7 +31,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -39,7 +39,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs127

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers= server1, server2,server3  ,server4
 user=maxskysql
-passwd= skysql
+password= skysql
 
 [RW Split Router]
 type=service
 router= readwritesplit
 servers=server1,     server2,              server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS,disable_sescmd_history=YES
 
 [Read Connection Router Slave]
@@ -23,7 +23,7 @@ router=readconnroute
 router_options= slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -31,7 +31,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs1295

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -14,7 +14,7 @@ type=service
 router=readwritesplit
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 strict_multi_stmt=false
 strict_sp_calls=true
 

maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db

@@ -7,14 +7,14 @@ type=monitor
 module=mysqlmon
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Sharding router]
 type=service
 router=schemarouter
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 auth_all_servers=1
 ignore_databases_regex=.*
 

maxscale-system-test/cnf/maxscale.cnf.template.mxs1323

@@ -9,7 +9,7 @@ type=monitor
 module=mysqlmon
 servers= server1,server2
 user=maxskysql
-passwd= skysql
+password= skysql
 monitor_interval=1000
 backend_read_timeout=1
 backend_connect_timeout=1
@@ -19,7 +19,7 @@ type=service
 router= readwritesplit
 servers=server1,server2
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth

@@ -6,7 +6,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -14,7 +14,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Slave]
 type=service
@@ -22,7 +22,7 @@ router=readconnroute
 router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [Read Connection Router Master]
 type=service
@@ -30,7 +30,7 @@ router=readconnroute
 router_options=master
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 
 [RW Split Listener]
 type=listener

maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted

@@ -7,7 +7,7 @@ type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 monitor_interval=1000
 
 [RW Split Router]
@@ -15,7 +15,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
-passwd=skysql
+password=skysql
 router_options=master_failure_mode=error_on_write
 
 [RW Split Listener]