Bug 1050404 - [Collections] Update to use gaia-header