fix puppet's deprecated warnings
Merge branch 'fix-puppet-deprecated-warnings'

* fix-puppet-deprecated-warnings:
  fix puppet's deprecated warnings