Bug 946343 - Implements --manifest-overload r=@erikvold