Puppet 2.6 compat

Change-Id: I85534d6ff8a7056fffc52437ce0c7b889d2a38e2