[9451] - See http://tracker.modx.com/issues/9451
Merge remote-tracking branch 'rtripault/bug-9451' into bug-9451

* rtripault/bug-9451:
  [9451] - See http://tracker.modx.com/issues/9451
[#9451] changelog entry
[#9451] Add modx-combo-source as settings type

Merge branch 'bug-9451' into release-2.2

* bug-9451:
  [#9451] changelog entry
  [9451] - See http://tracker.modx.com/issues/9451