fix merge conflict issue from release-0.9 branch to devel

diff --cc Makefile
Simple merge

diff --cc gitbuildsys/__init__.py
index 59dad893dcc01d07abcb04721592c9aef58c5eb8,d1433f52b34ddce00a7c08bdf621c3c4eb576fb6..64dbb97a404e32fac03c2b157523c7da63e73b2c
--- 1/gitbuildsys/__init__.py
--- 2/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py
@@@ -20,4 -20,3 +20,4 @@@
  module for gbs tool
  """
  
- __version__ = "0.8.1"
++__version__ = "0.9"

diff --cc gitbuildsys/cmd_build.py
Simple merge

diff --cc gitbuildsys/oscapi.py
Simple merge

diff --cc gitbuildsys/utils.py
Simple merge

diff --cc tools/gbs
Simple merge