Merge branch 'master' into v7.0

Change-Id: I2f681df4119c974dc076f667db20c01a473d9d55
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index 7b00243..76065b3 100755
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 rm -rf deb_dist osmclient-*.tar.gz
-tox -e build,build3
+tox -e build3