Upgrade for puppet 2.7