Fixed xml syntax errors in the config
Merge branch 'master_3673'

Conflicts:
	doc/factory/configuration.html