Merge pull request #990 from puppetlabs/apt_keyserver