Merge "Fix idempotency issues that could cause install/configuration failures"
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 23 Nov 2016 15:29:51 +0000 (16:29 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Wed, 23 Nov 2016 15:29:51 +0000 (16:29 +0100)

Trivial merge