Fix "options are only allowed before install arguments" error.

This reverts feb748f488 and 7cd7077467. `bootstrap_options` is
meant for flag options such as `-D`. This is demonstrated in the
example Vagrantfile from the original plugin:
github.com/saltstack/salty-vagrant/blob/develop/example/complete/Vagrantfile
Flag options must be appended to the options string before install
args such as `install_type` and `install_args`.
core: provisioner sentinel should check machine ID
Merge pull request #3005 from ajw0100/fix-salt-options-error

provisioners/salt: Fix "options are only allowed before install arguments" error.
Update CHANGELOG
provisioners/shell: error if invalid encoding [GH-3000]
website/docs: update docs for auto_config [GH-3015]
providers/virtualbox: don't log in trap context
Avoid locking in trap context
core: if can't communicate, force halt right away
communicators/ssh: rescue/show correct error messages
Fix failing tests
core: error-exit machine readable output type for errors [GH-2999]