Revert "Removing initfiles hack for puppet conf"

This reverts commit 39b712873e702c8f2cd58a787bf3f40dbd9edb2d.