Update config.dist.json file
Merge remote-tracking branch 'remotes/origin/framework' into g11n

Conflicts:
	etc/config.dist.json