allow configuration of log file innodb settings
Merge branch 'innodb-configuration'

Conflicts:
	manifests/config.pp