Updating for factor-1.6.18
Updating for puppet-3.1.1