Fix syntax error from bad merge
Merge branch 'support_puppetdb' into movealong