More fixes for file permissions/ownerships

Turning ulsfo to the new puppetmaster infrastructure revealed a few more
permissions/ownerships inconsistencies. Fixing them and linting a bit in
the process

Change-Id: I68c2376d990ff9e8a9635e3106a1bfd15a2806e3
Merge "More fixes for file permissions/ownerships" into production