Convert ::data pattern to parameters for Puppet v3

Did some more fixes