Merge branch 'master', remote branch 'origin'
Modified cookbook1 node def