Merge "Replace /etc/aptly-publisher.yaml -> /etc/aptly/publisher.yaml"