Merge changes I29f71b34,I15a16bbb

* changes:
  Use minified tag names for rule XML
  Implement XML serializing for rule