Bug 403538 - Fix templates and rename scripts to distinguish S from I
builds
2 files changed