Fix easy-to-fix patch comments.
Rename command line parameter 'entropy-data' to 'salt-data' to align it with the naming in the code.
Adapt test.