+++ This bug was initially created as a clone of Bug #1294547 +++
+++                                                           +++
+++ Use this bug to post a fix in the master branch.          +++

The output of the cli with the --xml flag is inconsistent. Every cli command should output xml if that flag is set.

At the very minimum, a valid xml message could just be the string output wrapped in xml, ie.:

# gluster --xml --version
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cliOutput>
  <opRet>0</opRet>
  <opRetStr>glusterfs 3.7.6 built on Dec 11 2015 22:26:22
Repository revision: git://git.gluster.com/glusterfs.git
Copyright (c) 2006-2011 Gluster Inc. <http://www.gluster.com>
GlusterFS comes with ABSOLUTELY NO WARRANTY.
You may redistribute copies of GlusterFS under the terms of the GNU General Public License.</opRetStr>
</cliOutput>

This would allow an application to rely on sane input that can always be dom processed.