Add a conditional checking for CentOS 7 and use a separate URL for Puppet RPMs there. Also drop the unnecessary custom package resource for CentOS 6 if installing on 7. Change-Id: I30bb911320e731ef987b796cdd73dad7c1b7bbcd