Merge "Modify puppet-fdio node"