Merge pull request #1640 from aszeszo/master

More robust Solaris detection
Update CHANGELOG for GH-1639
Attempt to read guest additions version from showvminfo [GH-1575]
Box add URL with windows drive letter works properly
Convert DOS line endings to Unix in shell provisioner [GH-1495]
Better message when using VirtualBox config
v1.2.2
Up version for development
Add missing note about `Vagrant::Environment::VAGRANT_HOME` deprecation to the changelog
Merge pull request #1661 from fgrehm/add-note-about-deprecated-vagrant-home-to-changelog

Add missing note about `Vagrant::Environment::VAGRANT_HOME` deprecation to the changelog
More robust VBoxManage error checking. [GH-1669]
Detect missing Linux kexts via vboxnetctl error message [GH-1671]
SmartOS support for setting hostnames [GH-1672]
Support working_directory option for Puppet [GH-1670]
Use the proper path on Puppet apply to the manifest
More reliable Ubuntu and Debian guest detection

When dealing with lxc containers, '/proc/version' will have information
about the host machine kernel that can possibly have information about
an Ubuntu / Debian host, messing up with guest container detection.
Merge pull request #1685 from fgrehm/more-reliable-ubuntu-and-debian-guest-detection

More reliable Ubuntu and Debian guest detection
Puppet provisioner supports hiera by specifying hiera_config_path
Update CHANGELOG
Ignore "guest not ready" error when graceful halting [GH-1679]