Strip archive extension for CMS folder, too
This still adds a _1_ to the archive name but I think that
is a gpgtar thing where we cannot do much about right now.
(cherry picked from commit 8d92fe5684efb39059bf83ccb55c3cee78b0171b)
- GnuPG-Bug-ID: T6531