updates for puppet3