Make sure that the temp zone has an .htaccess file

Change-Id: I357c6f6a60b4eb531636132180a717f4186b1797
Merge "Make sure that the temp zone has an .htaccess file"