Merge branch 'bugfix/puppet-version' into bugfix/csr