Branch 'SPACEWALK-1.9' - rel-eng/comps