Fixes #4978: edit the testsuite to be compatible with the CFEngine 3.6 output format
Merge pull request #60 from ncharles/bug_4978/int/test_suite_for_3_6

Fixes #4978: edit the testsuite to be compatible with the CFEngine 3.6 o...