Merge pull request #373 from pasinskim/3.6.x

Updating test cases to not relay on ordering of getindices any more.
Enable use of correct make tool when doing parallel testing.

testall needs the MAKE variable in order to call make recursively.
(cherry picked from commit 5015f43bdfb4a3692abcb5e091fe17e62c9fc90f)
use default (generic) package body and add metadata for story_id 5513 (package present)

Modified by: Kristian Amlie <kristian.amlie@cfengine.com>

(cherry picked from commit 065c401fa67fd03bbe8ca01a560dbd80d68dd717)
use default (generic) package body and add metadata for story_id 5514 (package absent)

Modified by: Kristian Amlie <kristian.amlie@cfengine.com>

(cherry picked from commit ad46ca1278b53a245a7608b3b5d2d10a39ce6294)
Change: Enterprise HA policy cleanup

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

The CFEngine Enterpise HA policy uses features from 3.6. When the policy
is loaded on 3.5 and earlier clients it fails to validate.

Make the HA policy only load on En Additionally there is no reason to
load the HA policy on clients that are not enterprise hubs.

Change class names to make them more self describing and specific to
reduce changes of clashing with custom policies.

Move enablement of hub ha to def and update_def from ha_def with other
feature enablement classes.
(cherry picked from commit 4e03022d3aff36cdd192e00115d565d228e8f7b1)

Conflicts:

	lib/3.7/stdlib.cf
	update.cf