Bug#849161: snap: /usr/bin/snap provided by both snap and snapd

[Jeremy Bicha]

Control: clone -1 -2
Control: retitle -2 snapd: /usr/bin/snap provided by both snap and snapd

The manpage needs to be renamed too: /usr/share/man/man1/snap.1.gz

https://launchpad.net/bugs/1571989

Thanks,
Jeremy Bicha