Merge remote-tracking branch 'gh/next'

Conflicts:
	PendingReleaseNotes

diff --cc PendingReleaseNotes
index 842794cb143991dbe4d7e1b3777fa5788083ed40,f94c98fb7fec0cee033aee3fdf4002459df5687c..ae3b5b184ba47471eb96762dd80042097f69ae1d
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -30,5 -44,8 +30,10 @@@ v0.9
    a bogus value (for example, when rados_watch() returns an error and
    handle is not defined).
  
+ * The structure of the formatted 'pg stat' command is changed for the
+   portion that counts states by name to avoid using the '+' character
+   (which appears in state names) as part of the XML token (it is not
+   legal).
+ 
 +v0.92
 +-----

diff --cc src/mon/PGMap.cc
Simple merge