Bug 893284 - Fix ds-test to work with composite support removed.
Merge pull request #11326 from dhylands/dhylands-893284-ds-test

Bug 893284 - Fix ds-test to work with composite support removed. r=djf