Merge "Fixed new aptly.server.mirror classes typos"