Merge "Bump Puppet version 4.x to 5.x"