Bug 428803 - Clean up container package
18 files changed