Merge branch 'master' into devel

Change-Id: I09830eca415172d1e381ea737ab833ac0c757e43

diff --cc ChangeLog
index b5c0fafaaa5a5143cc623232ea99656c682d5085,614f76e148387a69fee10d4aa02c0af5c253c513..614f76e148387a69fee10d4aa02c0af5c253c513
mode 100755,100644..100755
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog

diff --cc debian/changelog
index 0ee69cca80a6a0cd2296b0b69990ba8811cc9686,39245338d0363f73b6d4310a134f82b844e4cbcc..39245338d0363f73b6d4310a134f82b844e4cbcc
mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog

diff --cc doc/RELEASE_NOTES
index 51ec8d8f773cfffdea7952a28be8eb45f26494c2,c6e1bcb2bb40c152c523da0067e3777b6c115935..c6e1bcb2bb40c152c523da0067e3777b6c115935
mode 100755,100644..100755
--- 1/doc/RELEASE_NOTES
--- 2/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES

diff --cc mic/imager/baseimager.py
Simple merge

diff --cc mic/utils/misc.py
index 738ac66dbb5c42954762dee9c2fa52cfed185a56,1e337d97254d3968f534022c64fb782b9e5e1e6b..5ae04dfba0ff59d50869824bdc1c231a679f6903
--- 1/mic/utils/misc.py
--- 2/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@@ -944,11 -937,8 +937,9 @@@ def setup_qemu_emulator(rootdir, arch)
      if not os.path.exists(node):
          if arch == "aarch64":
              qemu_arm_string = ":aarch64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xb7:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff:%s:\n" % qemu_emulator
-         elif arch == "mipsel":
-             qemu_arm_string = ":mipsel:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x08\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xfe\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:%s:\n" % qemu_emulator
          else:
              qemu_arm_string = ":arm:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfa\\xff\\xff\\xff:%s:\n" % qemu_emulator
 +
          with open("/proc/sys/fs/binfmt_misc/register", "w") as fd:
              fd.write(qemu_arm_string)
  

diff --cc packaging/mic.changes
index 70ff045776c4e47783fd71cc8805684ea8cda4d5,150074ef54ca0629904631d3ec2164e97b51e7e0..150074ef54ca0629904631d3ec2164e97b51e7e0
mode 100755,100644..100755
--- 1/packaging/mic.changes
--- 2/packaging/mic.changes
+++ b/packaging/mic.changes