Merge branch '1.6.x' of github.com:puppetlabs/puppetlabs-apt into 1.6.x