update for deprecated wsrep_urls argument
cleanup mysql setup using wsrep_cluster_address
Merge branch 'master' into contrail

Conflicts:
	cookbooks/bcpc/recipes/powerdns.rb
config for 1.20 release of contrail