Bump version for development
CHEF-3574: Fix copy-pasta error in whyrun message
Merge branch 'OC-4668'
[OC-4668] fix constant scoping ::File vs. File
[OC-4668] fix file rm in test teardown for ruby 1.8
move test files from cherry-pick to correct part of tree
Rebased and merged branch immediate-converge-action onto 10-stable from master.
Merge branch 'immediate-converge-action-rebase-10' into 10-stable
CHEF-3577: Allow ssh config port and user to be used

Net::SSH::Multi takes a user argument which we pass, so we need to read
the user from the ssh_config before passing the user and use it if
applicable.

We also were sending port 22 even if the user hadn't specified a port,
due to a mixlib-cli default. This would override any port set in an
ssh config. It isn't necessary to send a port, Net::SSH will default to
22 on its own.
CHEF-3576: add raspbian as a supported platform
Place script in repo for running CI tests

Chef 10 and 11 differ in directory structure so lets add a script to ease that
This also exposes our testing a bit so other people know what we are doing
interally.
Save @config[:knife] before tests

Stop trampling on the other tests bootstrap.
[CHEF-3392] (10-stable) compat with version 1 encrypted dbi format
Merge branch 'CHEF-3392-10-stable' into 10-stable
[CHEF-3392] fix ruby 1.8 detection of version 1 format
[CHEF-3616] add cipher field to edbi metadata

Adds back compat support for adding the "cipher" field to encrypted data
bag v1 format.
Merge branch 'CHEF-3616-10-stable' into 10-stable
try running functional tests first

...should help avoid pollution of global state from unit tests
replace thin w/ webrick for func. test server
fixes binmode issues on windows