ARIES-754: Try to get trunk building properly again
ARIES-754: Try to get trunk building properly again

git-svn-id: f3027bd689517dd712b868b0d3f5f59c3162b83d@1185071 13f79535-47bb-0310-9956-ffa450edef68

gnodet/aries,fwassmer/aries,alexandreroman/aries,fwassmer/aries,kameshsampath/aries,alexandreroman/aries,acartapanis/aries,kameshsampath/aries,WouterBanckenACA/aries,alexandreroman/aries,acartapanis/aries,WouterBanckenACA/aries,fwassmer/aries,kameshsampath/aries,maxbruecken/aries,fwassmer/aries,MeiSheng/aries,acartapanis/aries,jwross/aries,tomdw/aries,maxbruecken/aries,tomdw/aries,tomdw/aries,ggerla/aries,maxbruecken/aries,WouterBanckenACA/aries,MeiSheng/aries,maxbruecken/aries,metatechbe/aries,alexandreroman/aries,metatechbe/aries,ggerla/aries,MeiSheng/aries,gnodet/aries,ggerla/aries,metatechbe/aries,jwross/aries,WouterBanckenACA/aries,MeiSheng/aries,tomdw/aries,ggerla/aries,gnodet/aries,gnodet/aries,kameshsampath/aries,acartapanis/aries,jwross/aries,jwross/aries,metatechbe/aries