avoid unnecessary whitespace
Merge remote branch 'upstream/master' into replication-configuration
Merge remote branch 'upstream/master' into innodb-configuration

Conflicts:
	templates/my.cnf.erb
correctly reference variables as instance variables
correctly reference variables as instance variables
Merge branch 'replication-configuration'
Merge branch 'innodb-configuration'

Conflicts:
	templates/my.cnf.erb