Merge "Add --no-unlink option to secdiscard for testing."