[9527] - See http://tracker.modx.com/issues/9527
Allow password reset with user email
Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Update getPK() to look for Schema Version 1.1 indexes first
Fixed lexicon example -- added trailing slash
MODX Revolution 2.2.8-pl

Merge branch 'release-2.2'

* release-2.2: (21 commits)
  Remove debugging code (Loud Sigh)
  Bump version for 2.2.8-pl
  Fix pass var by ref error in modX::getInstance()
  [#9450] Prevent non-existent Context initialization
  Bump version for 2.2.8-dev
  Fixed offline problem described in http://tracker.modx.com/issues/6138
  Fixed icon for datefield inline editor in grid
  Fix of wrong icon for datefield in grid toolbar
  [#9946] - Please see http://tracker.modx.com/issues/9946
  [#9859] Fix a near infinite recursion loop on TV ouptut filtering
  Revert "Increase width of file and image TVs"
  [#9901] Fix empty resourceMap in sqlsrv
  [#9912] Fix length of modResource.uri index
  [#9846] Fix incorrect parameter order passed to findResource
  [#9814] Fix cross-context links using link tags
  [#9896] Reduces time to process TVs
  Refresh file list after file remove
  Fix remove file from root if no folder selected in tree
  Refresh files after upload if no tree folder was selected (root)
  Fix browser listing in root after media source change
  ...
MODX Revolution 2.2.8-pl

(previously tagged v2.2.8-pl is invalid)

Merge branch 'release-2.2'

* release-2.2:
  Prevent empty HTTP_MODAUTH from succeeding
Fixed bug 9916: added the "TABLE" bit to the query.
Filtered error messages so they don't crash the javascript modals.
[#9826] fix errant creation of new PolicyTemplates
(Bug fix) Prevent Modx.console onMessage callback accumulating.
(bug fix) Removed console.fireEvent('complete') after clearCache.
This causes a timing issue where it fires a "complete" event **before** modx-console has finished digesting all messages.
Anyway, this fireEvent is **not** needed.
Fix login processor to use absolute url redirects for mgr

Allows mgr deployments on subdomains, https-only configurations, etc. - uses url_scheme+http_host+manager_url
[#9826] Fix errant creation of Policy Templates

add changelog msg
[#9826] Fix errant creation of Policy Templates

Merge branch 'bug-9826' into release-2.2

* bug-9826:
  [#9826] Fix errant creation of Policy Templates
  [#9826] fix errant creation of new PolicyTemplates
Fix login processor to use absolute url redirects for mgr

Merge remote-tracking branch 'opengeek/mgr-login-redirect-fix' into release-2.2

* opengeek/mgr-login-redirect-fix:
  Fix login processor to use absolute url redirects for mgr

Conflicts:
	core/docs/changelog.txt
[#9527] Fix password reset by user email

Merge remote-tracking branch 'rtripault/fix-9527' into bug-9527
Added missing trailing slash to example path

lexicon update only

Merge remote-tracking branch 'fireproofsocks/bug-6428' into release-2.2
[#9916] Add TABLE to TRUNCATE SQL in flushSessions

Fixes error on SQLSRV platform

Merge remote-tracking branch 'fireproofsocks/bug-9916' into release-2.2

* fireproofsocks/bug-9916:
  Fixed bug 9916: added the "TABLE" bit to the query.
Set context_key based on parent context_key

Fixes a bug where resources created from imports always have 'web' as the context_key rather than the actual context they are being created on.
(cherry picked from commit c5e3fa210b257dd431a5fb15b1528b15a5de2ce3)
Set context_key based on parent context_key

Checks the parent resource for context_key value, rather than assuming 'web'.
(cherry picked from commit a7284dd47ef35687a7ee707ccb9a791d01318a91)