Changes needed for the new kiwi's environ api

Change-Id: I4a960cb5929f8b7c0fa8b42bd2f68f5c9aa26f76