Simplify our attempt to fix repo dir permissions.

Otto obfuscated the File resource name on my suggestions, but it
turns out to do the opposite of what I'd hoped.  Now Puppet fails
to observe the if (!defined) bit, but still registers a conflict
when it comes to to actually create the dir.

This way at least we can rely on the if (!defined) bit.

Change-Id: I2e0815b305023816c8849d7232623eccbc633f19
Merge "Simplify our attempt to fix repo dir permissions." into production