SHRINKRES-126 Embedded gradle importer - completing merge