Merge "Stopping setting identity-feature-enabled if Patrole"
authorCedric Ollivier <cedric.ollivier@orange.com>
Mon, 12 Mar 2018 14:42:35 +0000 (14:42 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 12 Mar 2018 14:42:35 +0000 (14:42 +0000)

Trivial merge