Renaming internal variables away from savanna

*Renaming internal variables from savanna to sahara where appropriate.
*Other savanna instances are renamed to something more generic

Partial-Implements:  blueprint savanna-renaming-dashboard

Change-Id: Idc843e5c7ed0d42443c49842818f82751bfc7095