Merge branch 'release-0.15' into devel

Conflicts:
	etc/bootstrap.conf
	mic/bootstrap.py
	mic/creator.py
	mic/imager/raw.py
	mic/msger.py
	mic/utils/misc.py
	setup.py

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --cc etc/mic.conf.in
Simple merge

diff --cc mic/creator.py
Simple merge

diff --cc mic/utils/misc.py
index 5e11f5c,4ac411a..1eec13a
--- 1/mic/utils/misc.py
--- 2/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@@ -25,10 -26,16 +25,18 @@@ import hashli
  import subprocess
  import platform
  import rpmmisc
 +import hashlib
 +import sqlite3 as sqlite
  
- from xml.etree import cElementTree
+ try:
+     import sqlite3 as sqlite
+ except ImportError:
+     import sqlite
+ 
+ try:
+     from xml.etree import cElementTree
+ except ImportError:
+     import cElementTree
  xmlparse = cElementTree.parse
  
  from errors import *

diff --cc packaging/mic.spec
Simple merge

diff --cc plugins/imager/fs_plugin.py
Simple merge

diff --cc plugins/imager/livecd_plugin.py
Simple merge

diff --cc plugins/imager/liveusb_plugin.py
Simple merge

diff --cc plugins/imager/loop_plugin.py
Simple merge

diff --cc plugins/imager/raw_plugin.py
Simple merge

diff --cc setup.py
index bf0d6ee,f68c1c0..2c79dda
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -77,8 -77,7 +77,7 @@@ if prefix.lstrip('/') == 'usr'
  else:
      etc_prefix = os.path.join(prefix, 'etc')
  
 -conffile = 'distfiles/mic.conf'
 +conffile = 'etc/mic.conf'
- bsconf = 'etc/bootstrap.conf'
  if os.path.isfile('%s/mic/mic.conf' % etc_prefix):
      conffile += '.new'