Merge branch 'add-setup-mode'
Merge branch 'use-puppet-template'
Merge branch 'stacksh-notimeout'