sample-conf has been removed from savanna-manage

Change-Id: I5ddce6ca626822fece246c6f22ecb44913937e4d
Merge "sample-conf has been removed from savanna-manage"