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
updated changes.txt
[maven-release-plugin] prepare release whois-1.67.4
[maven-release-plugin] prepare for next development iteration
Use default set of sources to query
Put port43 value into a property
Merge branch 'upstream' into upstream-rdap

Conflicts:
	whois-api/pom.xml
	whois-commons/pom.xml
	whois-db/pom.xml
	whois-endtoend/pom.xml
	whois-nrtm/pom.xml
	whois-oneshot/pom.xml
	whois-query/pom.xml
	whois-scheduler/pom.xml
	whois-update/pom.xml