Fixes #2353  Problem: the old re-bundling way does not respected multiple service locator files to be merged

Fixes #2353

Problem: the old re-bundling way does not respected multiple service locator files to be merged