Rename Savanna to Sahara

Implements: blueprint savanna-renaming-extra

Change-Id: I5db8125aee11e617b5aa3b16eb7691b11e3d7281
Merge "Rename Savanna to Sahara"