Merge "Fix salt for verity tree generation."