Move pre-puppet apply shell customization to pre-puppet-apply.sh