kacf

diff --git a/mender-binary-delta1.md b/mender-binary-delta2.md
index 40c7435..f5406df 100644
--- a/mender-binary-delta1.md
+++ b/mender-binary-delta2.md
@@ -92,10 +92,22 @@ The content of the archive should be:
 
 As you might have guessed, we have prepared binaries for the `armhf` and `x86_64` architectures. If your platform architecture does not match the provided binaries, please contact us and we should be able to compile binaries for your target.
 
-The `mender-binary-delta` binary is intended to be installed on the device on which you intend to perform delta updates on.
+The `mender-binary-delta` binary is intended to be installed on the device on which you intend to perform delta updates on. However, the Yocto integration works directly with the `.tar.xz` file, so we don't need the binary here.

kacf

diff --git a/meta-mender-core/recipes-mender/mender/files/mender.service b/meta-mender-core/recipes-mender/mender/files/mender.service
index ec77fbc..9cdb723 100644
--- a/meta-mender-core/recipes-mender/mender/files/mender.service
+++ b/meta-mender-core/recipes-mender/mender/files/mender.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Mender OTA update service
-After=systemd-resolved.service
+After=systemd-resolved.service systemd-timesyncd.service
+Wants=systemd-timesyncd.service

kacf

diff --git a/build-scripts/bootstrap-tarballs b/build-scripts/bootstrap-tarballs
index 70321d2..94cf2fb 100755
--- a/build-scripts/bootstrap-tarballs
+++ b/build-scripts/bootstrap-tarballs
@@ -27,12 +27,3 @@ cd $BASEDIR/output/tarballs
 sha256sum *.tar.gz > sha256sums.txt
 CKSUM=`sum sha256sums.txt | cut -d ' ' -f 1`
 mv sha256sums.txt sha256sums.$CKSUM.txt
-
-# DELETE the git-checked-out directories, they are tainted with

kacf

diff --git a/libpromises/generic_agent.c b/libpromises/generic_agent.c
index 0edd0c8..4957802 100644
--- a/libpromises/generic_agent.c
+++ b/libpromises/generic_agent.c
@@ -816,11 +816,11 @@ static bool GeneratePolicyReleaseIDFromGit(char *release_id_out,
     {
         char git_head[128];
         int scanned = fscanf(git_file, "ref: %127s", git_head);
-        fclose(git_file);
 

kacf

diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf b/tests/acceptance/01_vars/02_functions/readdata.cf
index ad886ee..406aecd 100644
--- a/tests/acceptance/01_vars/02_functions/readdata.cf
+++ b/tests/acceptance/01_vars/02_functions/readdata.cf
@@ -24,6 +24,14 @@ bundle agent test
       "extension_yaml" data => readdata("$(this.promise_filename).yaml", "auto");
       "extension_json" data => readdata("$(this.promise_filename).json", "auto");
 
+      "failed_explicit_csv" data => readdata("$(this.promise_filename)", "CSV");
+      "failed_explicit_yaml" data => readdata("$(this.promise_filename)", "YAML");

kacf

commit 974c69b74f54cd7e3cc37904d61b81fa48cf7d5d
Author: Nick Anderson <nick@cmdln.org>
Date:   Wed Feb 11 19:28:39 2015

    Add: Purging of old scheduled reports for Mission Portal
    
    Scheduled reports need to be cleaned up after some time so that they do
    not fill up the disk on CFEngine Enterprise Mission Portal hubs.
    
    Also removed cfe_internal_setup_knowledge_files_tmp_dir as it was a

kacf

diff --git a/configure.ac b/configure.ac
index c960c10..77f4fd0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -467,21 +467,18 @@ then
     fi
 
     # xml2-config is only for native builds
-    if test "x$cross_compiling" = "xno"
+    if test "x$cross_compiling" = "xno" && test x`which $XML2_CONFIG` != x