Removed migration-time config folders lookup

Search in 'sahara' folders in addition was needed before
renaming savanna to sahara. After renaming it is a default option.

Change-Id: I41fdf2198c0e5f013794cac5354fd5460798806b
Merge "Removed migration-time config folders lookup"