Fix acceptance tests on Solaris 9 SPARC.

(cherry picked from commit de8f2ce29b12c524173236220a8fad4b72ab19a7)
Remove unexpanded lists when extending lists

Instead of overwriting the list value with cf_null, which is then
no longer stripped out during later processing, take unexpanded
entries out of the list.

Extend existing acceptance test.

Fixes redmine 6541

(cherry picked from commit 65e346d4588d87fb86a4a9ea173f915f9c7373e0)
Add another situation to list expansion test.

(cherry picked from commit c0298c1f78bde474500688e8de659e939317f421)
Add: Acceptance test for classes defined from delete body

When a promise repairs a file or directory the same promise should not
define an outcome of kept during the same agent activation.

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

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

(cherry picked from commit 446da7a8017bd2c23658e957ebeac9dffc639536)
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x