merge .env and .pillar states

Change-Id: Ie5955b29b0bbdc502ad71de9bb50e38b6a8896bd
1 file changed