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

Conflicts:
	mariadb-start
Merge pull request #4 from mhess-connectify/master

fixes to mariadb-start
Fixed formatting of provider options
Merge pull request #1 from mhess-connectify/patch-1

fixed formatting
Merge pull request #5 from mhess-connectify/master

fixed formatting
removed whitespace after WSREP_PROVIDER_OPTIONS
Merge branch 'master' of https://github.com/mhess-connectify/mariadb55
Merge pull request #6 from mhess-connectify/master

whitespace fix
removed debug code
Merge pull request #7 from mhess-connectify/master

removed debug code
Start work on adding monituser
Merging uptream
Add wsrep plugin or monit
Add monit user as env variable too
Merge pull request #4 from nsasikumar/trusty

Trusty