Merge "fix typo in rsyncd.conf"