Merge remote-tracking branch 'waldi/rsyncd-buildd-keyrings-auth'