Merge "Unify code for scenario v0.2 v0.3"
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 13 Feb 2017 14:21:44 +0000 (15:21 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Mon, 13 Feb 2017 14:21:44 +0000 (15:21 +0100)

Trivial merge