Merge from master (v1.4.1)

diff --cc src/rrdp/db/db_rrdp.c
Simple merge

diff --cc src/rsync/rsync.c
index 4ba18183d5c54dbff73625812f0fb1a674798c90,786e3b3241115897d85ba5671c5ad1ebcbde9244..e986cfdcfde20bd8dbcb3fd1cc9c4efa5aa77a00
--- 1/src/rsync/rsync.c
--- 2/src/rsync/rsync.c
+++ b/src/rsync/rsync.c
@@@ -518,15 -520,9 +518,15 @@@ ancestor_error(char const *error_uri, v
                return ENSURE_NEGATIVE(error);
        }
  
 +      /* Ignore non rsync error'd URIs */
 +      if (!uri_is_rsync(req_err_uri)) {
 +              free(req_err_uri);
 +              return 0;
 +      }
 +
        error = is_descendant(req_err_uri, search) ? EEXIST : 0;
  
-       free(req_err_uri);
+       uri_refput(req_err_uri);
        return error;
  }