Merge changes Ie4aef1bd,I1bfc9323

* changes:
  Add sha1 support for hashtree
  Add test to parse verity data