Fixes the getNodesFormatted method, when menu item has in a title "n_"
Make modx-browser-combo look for the default media source system setting
Merge remote-tracking branch 'upstream/pr/12024' into pr/12024

* upstream/pr/12024:
  Make modx-browser-combo look for the default media source system setting
Merge remote-tracking branch 'upstream/pr/11995' into pr/11995

* upstream/pr/11995:
  Fixes the getNodesFormatted method, when menu item has in a title "n_"

Conflicts:
	core/model/modx/processors/system/menu/sort.php
Actually commit the code... (cf. previous commit)