Merge branch 'master' into feature/COOK-3639
COOK-3639 Suggested enhancement of php.ini template support. Revert CHANGELOG.md
Merge branch 'feature/COOK-3639' into develop

Conflicts:
	CHANGELOG.md