few changes on section_sahara-install

added the in multiple places where needed
minor cleanup

Change-Id: I5d0836ebe9a3cb455c457dadfe46f68bb3e9317e
Merge "few changes on section_sahara-install"