updating test harness
[COOK-4018] Add TLS encryption support for client and server

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4022] Add use_local_ipv4 option

Signed-off-by: Sean OMeara <someara@opscode.com>
COOK-4256 Fix default.conf syntax errors for rhel

Signed-off-by: Sean OMeara <someara@opscode.com>
fixing merge conflict in metadata.rb