[COOK-3874] Revert f64d9017 from main server_test

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-3885] Correctly pass client_bin to the template

Signed-off-by: Sean OMeara <someara@opscode.com>
Merge branch 'master' of github.com:opscode-cookbooks/chef-client