move non-global config statements out of global tree
Merge branch 'v5-stable' into v7-stable

Conflicts:
	source/configuration/index.rst