Fix up hiera config files