Fix for puppet deprecation warnings