Merge "verity: move metadata after the hash tree"