Merge pull request #310 from estenberg/3.6.x

don't include monitoring by default in reporting
Add path to ethtool on debian, redhat, archlinux and suse

(cherry picked from commit 5071e9ca9187ee6a84293fcbd71fae8dae09ac9c)

Conflicts:
	lib/3.7/paths.cf
Fixes #6550: add classes suffix _error in case of failed, denied or timeouted promise

(cherry picked from commit 5972114bd7fd039d308eb3870050265688f237e6)

Conflicts:
	lib/3.7/common.cf
Change: Fix windows bios inventory

Fix inclusion of PSComputername into System manufacturer
Add System serial number and System version support

Ref: https://dev.cfengine.com/issues/6378
Merge pull request #316 from nickanderson/3.6.x

Change: Fix windows bios inventory
Truncate over-long strings of 9s.

We use long strings of 9s as bounding values for integers.  On 32-bit
values, if those long strings exceed 999999999 the resulting int wraps
and is smaller, so don't use more than nine 9s in a row.

(cherry picked from commit 58684edfd95a1eb8080eef3266c27e30f1180d1e)

Conflicts:
	lib/3.7/packages.cf
Change: Bump masterfiles version as specified in policy files
Merge pull request #318 from nickanderson/rev_3.6.2

Change: Bump masterfiles version as specified in policy files
Adding HA related changes.

Adding HA specific files. HA configuration data is stored in
cfe_internal/ha/ha_info.json.
Share keys between hubs and update policy_server.dat.
Copy hubs' keys to clients.
Disable HA by default.
Change the way client is updating policy_hub.dat content so that
right now it will be updated based on master hub IP placed in master_hub.dat.
Add separate directory where all hubs keys will be copied so that
client will be able to upload all hubs keys.
Add: Get unified list of hub SHAs.
Disable PostgreSQL maintenance policy to be run on slave hub.
Kill runalerts script on slave and make sure is working ONLY on master.
Synchronize PHP configuration files between master and slave.

(cherry picked from commit e636a3b15f2e2c8a02af02f5043688c4323db617)

Conflicts:
	def.cf
	update.cf
Change: Guard acl from being evaluated on windows

def.cf_runagent_shell is not used on windows, and having the acl in
place produces unwanted event log entries.

Ref: https://dev.cfengine.com/issues/6555
(cherry picked from commit 8c8399bbd3c4070bd5a4e91b098ff67da9f91420)
Fix managing runalerts script when HA is enabled.

Make sure that once HA is enabled and hub is NOT working as the active one
runalerts script wont be run. This will eliminate possibility of
having duplicate alert emails from both active and passive hubs.

(cherry picked from commit 52e3a66c303ebd4f364140656df601dadccfe463)
Add ha_enabled file needed by MP.

In MP first test to figure out if HA is switched on or not is checking
of existence of 'ha_enabled' file. Once HA is enabled file will be created
in directory accessible by httpd to indicate that current hub is working
in HA mode.

(cherry picked from commit 057c413288b4dbae1626bb60f3417e1ecf9d1a1c)
Clear execute bits from some files that shoulnd't have them set.

(cherry picked from commit 41520567bf654231b784650288eac28b9f355b1d)
Add synchronization of configuration for HA hubs.

Synchronize notification_scripts directory to copy notifications scripts
form active to passive hubs.
DON'T use u_rcp for copying files from one hub to another.
Allow access to needed configuration files for all hubs in HA installation.

(cherry picked from commit 18a79273cd710fdfcf7a44495cabbb00c5866d1f)
Redmine #6592: Hub should follow agents: No monitoring data by default

(cherry picked from commit ac66556b89d75318dc99889d6ec81187536275c2)

Conflicts:
	lib/3.7/reports.cf
    Adjust Diagnostics table name in hub maintenance policy to changes in 3.6.2.
    '__Diagnostics' --> 'Diagnostics'

    Redmine: #6609
Merge pull request #331 from maciejmrowiec/3.6.x

    Adjust Diagnostics table name in hub maintenance policy to changes i...
Update upgrade recipes to 3.6.2.

(cherry picked from commit b0c63e0d7fb119e4709e362820a44a481e097b4e)
Add upgrade package promise for AIX.

Right now it doesn't use cf-upgrade, because it hasn't been tested on
AIX. However, AIX seems to be well behaved when it comes to
overwriting files, so the upgrade will go just fine. Tested by
upgrading from 3.6.1 to 3.6.2 on AIX 5.3.

(cherry picked from commit 68d7dcd3f05772eb62ffa4dfc58f86532dd2256d)
Change: Fix default mailfrom

Ref: https://dev.cfengine.com/issues/6567

$(sys.host) is ambiguous and the old usage may produce a mailfrom of
root@foo.example.org.example.org for host "foo" in domain "example.org".