Merge changes Ic4587c5b,Ib7118228,I3411a0fb

* changes:
  Include isHashedValue in rule structure
  Support optional rule attributes in XML parser
  Add rule component validations