Merge "Add test for --hash-style=sysv"