fix as-block test breaks (apparently we used it heavily in tests)
fix test failure as followup to ds-rdata sanitization
adjust endtoend test regarding ds-rdata sanitization
don't warn about merging into single line if not primary key