Try grabbing this patch from puppet 3.4 to fix our issues:

https://github.com/puppetlabs/puppet/commit/2603322e2082464d9fe9bcd29fe4c82508d9456f