Automatic merge from release/3.0.2 -> master
Automatic merge from release/3.0.2 -> master

* commit '898415fa8f1f4f58c8e289ff0a94ee6daed77fda':
  OSDIAL-88 Fix JSON output by overriding the default simplexmlelement and displaying attributes as elements and text a part of the value element.

southskies/osdial,southskies/osdial,southskies/osdial,southskies/osdial,southskies/osdial