Handle coloVariants in D2Config

RB=141420
R=osumampo,slim,sihde,si-dev
A=osumampo
Merge branch 'd2ConfigMultiColo'