Merge "fix error ns_instances_content when not instantiated, rollback problems and...
authortierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 21 Dec 2018 14:04:40 +0000 (15:04 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 21 Dec 2018 14:04:40 +0000 (15:04 +0100)

Trivial merge