Feature/composition on v2 refactor

Ok this is really just a one line change, but its against the in-process v2 refactor work...  The ONLY change here is 91472b3.  The intent is to inject the stuff that the discovery class builds (for HP, Rax, RedHat...)