ADEN-428 ADEN-430 full GPT rollout

Conflicts:
	includes/wikia/DefaultSettings.php