Fix issues with puppet-lint >=1.0.0