Merge branch 'master' into v7.0

Change-Id: I0b8da73514a19adcfe8fd9e5d1a2e1b24f40a6f8
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --cc tox.ini
index a09288a,b02cab2..6fdc825
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -31,15 -36,12 +36,12 @@@ commands 
      pyflakes osmclient
  
  [testenv:build]
 -basepython = python
 +basepython = python3
  deps = stdeb
         setuptools-version-command
- commands = python setup.py --command-packages=stdeb.command bdist_deb
+        -r{toxinidir}/requirements.txt
+ install_command = python2 -m pip install -U {opts} {packages}
+ commands = python2 setup.py --command-packages=stdeb.command bdist_deb
  
  [testenv:build3]
  basepython = python3