refs #7207 - update deploy to fix el7 and other issues

update to latest puppet to avoid 3.6 to 3.7 mid-install update problem
do not use --reset as the server is not configured yet
when doing bats, just run the bootstrap, don't run setup.rb
I liked this being agnostic of the box types above. What if we moved this "basic" shell arg up top and had the boxes make use of it? e.g.

```
{:name => 'centos7', :shell_args => shell_args('centos7')}.merge(base_boxes[:centos7]),
{:name => 'centos7-bats', :shell_args => './bats/bootstrap_vagrant.sh'}.merge(base_boxes[:centos7]),
```