[bugzilla 374698 & 365089] Step2 : Improving the Intent merger so that Repository structure can be properly calculated
16 files changed