Merge remote-tracking branch 'origin/release-20161231' into devel

Conflicts:
	debian/changelog
	debian/control
	docs/RELEASE_NOTES
	gitbuildsys/__init__.py
	packaging/gbs.changes
	packaging/gbs.spec
	tools/gbs

Change-Id: I729d63ae5bde67a956f6de76204903073d7cfd63

diff --cc debian/changelog
index 2e2a9d6107840b3561deb06549839084a530a19a,c6fdd25878c07eae8448d3f4e2d83a9e43759c12..c6fdd25878c07eae8448d3f4e2d83a9e43759c12
mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog

diff --cc debian/control
index d25b95ff9687838cfa5da835aeff9fd250dc329d,d506d165741528d36d5edc730a048794d46c8109..d506d165741528d36d5edc730a048794d46c8109
mode 100755,100644..100755
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control

diff --cc docs/RELEASE_NOTES
index 011e6bf7e9b168ad756a11d30dfcd124a6383478,3608236ef4302865607d344c8713d5e5867226de..3608236ef4302865607d344c8713d5e5867226de
mode 100755,100644..100755
--- 1/docs/RELEASE_NOTES
--- 2/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES

diff --cc gitbuildsys/__init__.py
index d0244450d22e2152f3f17ebb7b2d6dd35acae5be,43a354754e9e7d92df7bbfd6b691b1039dc0e71d..43a354754e9e7d92df7bbfd6b691b1039dc0e71d
mode 100755,100644..100755
--- 1/gitbuildsys/__init__.py
--- 2/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py

diff --cc gitbuildsys/cmd_build.py
Simple merge

diff --cc packaging/gbs.changes
index 1c5a3fc435c8f85bdf243074d712650c97a03c79,50ebdd5d45243ae2b30ea641d5906da784e9c4d7..50ebdd5d45243ae2b30ea641d5906da784e9c4d7
mode 100755,100644..100755
--- 1/packaging/gbs.changes
--- 2/packaging/gbs.changes
+++ b/packaging/gbs.changes

diff --cc packaging/gbs.spec
index 7b6f917f696e8d502022bde394c8a36baac061d5,a0099b313e47f04263e7f3fd4e71f1c5929e3071..a0099b313e47f04263e7f3fd4e71f1c5929e3071
mode 100755,100644..100755
--- 1/packaging/gbs.spec
--- 2/packaging/gbs.spec
+++ b/packaging/gbs.spec

diff --cc tools/gbs
Simple merge