fix#3482 creating more Solaris folders on self-upgrade purpose
Merge pull request #46 from phnakarin/fix#3482

fix#3482 creating more Solaris folders on self-upgrade purpose
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
Merge branch 'master' of https://github.com/cfengine/masterfiles
Add ntpd, ssh and syslog for freebsd