[JBTM-1166] remove dependency on AS6 component matrix
[JBTM-1166] remove dependency on AS6 component matrix

mmusgrov/narayana,tomjenkinson/narayana,gytis/narayana,jbosstm/narayana,gytis/narayana,jbosstm/narayana,mmusgrov/narayana,tomjenkinson/narayana,tomjenkinson/narayana,mmusgrov/narayana,gytis/narayana,gytis/narayana,jbosstm/narayana,mmusgrov/narayana,gytis/narayana,jbosstm/narayana,gytis/narayana,tomjenkinson/narayana