FREEPBX-7422 Fix Japan Country Indications Tones
Merge branch 'release/2.11' into release/12.0

Conflicts:
	install.php
Merge branch 'release/12.0' into develop