removed consensus timeout option
Merge branch 'master' of https://github.com/mhess-connectify/mariadb55 into mhess-connectify-master

Conflicts:
	Dockerfile
Merge branch 'mhess-connectify-master'