Fixes to SEGMENT and WAN params
Merge branch 'master' of https://github.com/mhess-connectify/mariadb55

Conflicts:
	mariadb-start