Redmine#3482: Solaris 9 and 10 upgrade script
bundles.cf: add url_ping agent bundle to do HTTP ping
fix for when set_variable_values value contains =
fix for when set_variable_values value contains = (applying to 3.5 as well)
Merge pull request #49 from estenberg/bugfix/set_variable_values

fix for when set_variable_values value contains =
Storage of promise definitions was incorectly disabled - re enabling it to allow data generation for PromiseDefinitions table exposed through the enterprise SQL API

Redmine #3370

(cherry picked from commit eca1b09cfb31b78e2603a9d3c8e9270daa1fcc72 in nova)

Conflicts:
	masterfiles/update/update_policy.cf
Added logger to paths and ntp, ssh, and syslog to services
Merge pull request #50 from tzz/tzz/skreuzer/freebsd-logger-and-new-services

Added logger to paths and ntp, ssh, and syslog to services
Merge pull request #47 from tzz/feature/bundles/url_ping

bundles.cf: add url_ping agent bundle to do HTTP ping
Redmine#3756: rework update.cf and its children (policy, processes, bins, masterfiles)
Merge pull request #51 from tzz/feature/redmine3756-update-update

Redmine#3756: rework update.cf and its children (policy, processes, bins, masterfiles)
Acceptance test for base promises.cf
Merge pull request #52 from tzz/test/promises.cf

Acceptance test for base promises.cf
use cf-promises in acceptance test for base promises.cf
acceptance tests should default to CORE=../core
Use full path in default path to CORE.

Otherwise when we run tests in a subdirectory, the path is not correct
anymore.
Merge pull request #54 from kacfengine/master

Use full path in default path to CORE.
Redmine#3807: document append_to_line_end properly and fix doc bug
Merge pull request #57 from tzz/feature/3807-document-append_to_line_end

Redmine#3807: document append_to_line_end properly and fix doc bug
Add documentation for bundles in stdlib
fileinfo, logrotate, prunedir