Fix recursive strategy for umbrellas

[dariodf]

Uses a more aggresive approach to replace and recover umbrella mix files in order to improve logs and not require the dependency to be required everywhere.