Merge branch 'rrdp-refactor-2'

diff --cc configure.ac
Simple merge

diff --cc src/crypto/base64.c
Simple merge

diff --cc src/extension.c
Simple merge

diff --cc src/line_file.c
Simple merge

diff --cc src/log.c
Simple merge

diff --cc src/object/certificate.c
Simple merge