Fix bad merge in CHANGELOG.md and add Mirror Maker 2 (#2478)
Fix bad merge in CHANGELOG.md and add Mirror Maker 2 (#2478)

Signed-off-by: Jakub Scholz <c50267b906a652f2142cfab006e215c9f6fdc8a0@scholzj.com>
scholzj/barnabas,ppatierno/kaas,scholzj/barnabas,ppatierno/kaas