Fix savanna.conf.sample

Change-Id: I014d664b3948062170e833fdf9c1e6cccbb620b4
Merge "Fix savanna.conf.sample"