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 2e2a9d6,c6fdd25..c6fdd25
mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog

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

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

diff --cc gitbuildsys/__init__.py
index d024445,43a3547..43a3547
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 1c5a3fc,50ebdd5..50ebdd5
mode 100755,100644..100755
--- 1/packaging/gbs.changes
--- 2/packaging/gbs.changes
+++ b/packaging/gbs.changes

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

diff --cc tools/gbs
Simple merge