Don't create archives with double extension
BUG: 282884 FIXED-IN: 16.04.0
Differential Revision: D1187