New sap.conf + storage fix

Change-Id: Ia7eea521e5d4af68bc316a72a9fcbea4c39a391c