[Merge] lp:~bartoszcisek/ubuntu/trusty/puppet/bug-1410383 into lp:ubuntu/trusty/puppet

[Bartosz Cisek]

> This looks good, however it also needs fixing in Vivid. Would you mind
> preparing a branch for that too?

I added patch for Vivid. Merge request is linked to bug report. I'm not sure if I've done it right. 
-- 
https://code.launchpad.net/~bartoszcisek/ubuntu/trusty/puppet/bug-1410383/+merge/248915
Your team Ubuntu branches is requested to review the proposed merge of lp:~bartoszcisek/ubuntu/trusty/puppet/bug-1410383 into lp:ubuntu/trusty/puppet.