Merge branch 'develop' into features/draft-ietf-dnsop-svcb-https

diff --cc error.c
Simple merge

diff --cc ldns/error.h
Simple merge

diff --cc rr.c
Simple merge