Updated ja_JP
Updated ru_RU
Update for FREEPBX-6923
Merge branch 'develop'
Part fix for #6923 language not being set.
Merge branch 'master' into release/2.11

Conflicts:
	module.xml