Trying to deal with issue described http://forums.modx.com/thread/32541/modx-revo-event-output-issue-in-plugin#dis-post-437548 so now modEvent::output() can be used for setting the output, instead of "semi-private" modEvent::_output, which should generally be used only for internal interactions.
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#9629] Fix notice in xPDOConnection::getOption() when $options not an array
  [#9020] Prevent xPDOZip from attempting to add empty targets
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for xPDO 2.2.6-pl release
  [#7452] Fix sql errors with decimal fields in some locales
  [#9062] Fix problem loading multiple xPDOQuery driver classes
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Various documentation corrections
  Fix xPDOIterator->next() using void return value
  Fix undefined constant object in xPDO->toCache()
  Fix xPDO::prepare() sending no driver_options
  Fix xPDO::getInstance() when reusing existing
  Fix invalid call to $this->xpdo->log()
  [#9864] Identify compound PK's properly in xPDOQuery::parseConditions()
  Bump version for 2.2.8-dev
  Update getPK() to look for Schema Version 1.1 indexes first
  Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.8-pl release
Update of Czech translation for 2.2.9
Bump version for 2.2.10 dev
[#10182] Improve sanitization of processor_err_nf response

Prevent reflection of HTML in the modConnectorResponse::outputContent() method when passed via the action request parameter. This was being passed to the processor_err_nf lexicon's target parameter without proper sanitization of the data, which is returned as the JSON response's message property.

(cherry picked from commit 8c0a366e1b677d94c660ea47a98f96d0e90220e6)

Conflicts:
	core/docs/changelog.txt
Adding basic lexicon files for Brazilian Portuguese
Update of Czech translation

Merge remote-tracking branch 'origin/pr/588' into release-2.2

* origin/pr/588:
  Update of Czech translation for 2.2.9
Adding initial Brazilian Portuguese lexicon topics

Merge remote-tracking branch 'origin/pr/598' into release-2.2

* origin/pr/598:
  Adding basic lexicon files for Brazilian Portuguese
[#10183] Fix cache entry removal on xPDOObject::remove()
Wrong query statistic counting
Improve accuracy of query statistics

Merge remote-tracking branch 'origin/pr/15' into refactor-stats

* origin/pr/15:
  Wrong query statistic counting
Bump version for 2.2.9-dev
Fix xPDOTest::getTableMeta() error (sqlite/sqlsrv)
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix xPDOTest::getTableMeta() error (sqlite/sqlsrv)
  Bump version for 2.2.9-dev
  Wrong query statistic counting
  [#10183] Fix cache entry removal on xPDOObject::remove()
Bump version for 2.2.9-pl release