Merge "Fix puppet-fdio linting"