Artifact device type should come from the image itself to be consistent

mender.xml

@@ -56,6 +56,16 @@
   <exec executable="bash" dir="${sysdir}" failonerror="true">
    <arg line="-c &quot;echo 'artifact_name=${ARTIFACT_NAME}-${BUILD_ID}' > ${sysdir}/etc/mender/artifact_info&quot;"/>
   </exec>
+  <loadfile property="ARTIFACT_DEVICE_TYPE" srcFile="${sysdir}/etc/device_info" failonerror="true">
+    <filterchain>
+      <tokenfilter>
+        <containsregex pattern="^DEVICE_PRODUCT="/>
+        <replaceregex pattern="^.*='" replace=""/>
+        <replaceregex pattern="'" replace=""/>
+      </tokenfilter>
+      <striplinebreaks/>
+    </filterchain>
+  </loadfile>
   <copy todir="${builddir}/artifactscripts">
     <fileset dir="${sysdir}/etc/mender/artifactscripts"/>
   </copy>
@@ -64,7 +74,7 @@
    <arg line="if=${builddir}/disk.img of=${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4 bs=1048576 skip=${ABstart} count=${ABsize}"/>
   </exec>
   <exec executable="${builddir}/mender-artifact" dir="${builddir}" failonerror="true">
-   <arg line="write rootfs-image -v 2 -t ${DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -f ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
+   <arg line="write rootfs-image -v 2 -t ${ARTIFACT_DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -f ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
   </exec>
   <delete file="${builddir}/mender-artifact"/>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4"/>
@@ -73,7 +83,7 @@
 
  <target name="post-mender-artifact" depends="build-mender-artifact" if="env.MENDER_USER">
   <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE} ${basedir}/host/server.crt"/>
   </exec>
   <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
@@ -116,7 +126,7 @@
       </tokenfilter>
     </filterchain>
   </loadfile>
-  <loadfile property="DEVICE_TYPE" srcFile="${sysdir}/etc/device_info" failonerror="true">
+  <loadfile property="ARTIFACT_DEVICE_TYPE" srcFile="${sysdir}/etc/device_info" failonerror="true">
     <filterchain>
       <tokenfilter>
         <containsregex pattern="^DEVICE_PRODUCT="/>
@@ -134,7 +144,7 @@
    <arg line="if=${builddir}/disk.img of=${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4 bs=1048576 skip=${ABstart} count=${ABsize}"/>
   </exec>
   <exec executable="${builddir}/mender-artifact" dir="${builddir}" failonerror="true">
-   <arg line="write rootfs-image -v 2 -t ${DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -f ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
+   <arg line="write rootfs-image -v 2 -t ${ARTIFACT_DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -f ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
   </exec>
   <delete file="${builddir}/mender-artifact"/>
   <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4"/>
@@ -143,7 +153,7 @@
 
  <target name="repost-mender-artifact" depends="rebuild-mender-artifact" if="env.MENDER_USER">
   <exec executable="${basedir}/build-system/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
-   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${ARTIFACT_DEVICE_TYPE} ${basedir}/host/server.crt"/>
   </exec>
   <exec executable="${basedir}/build-system/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>