Merge "Wait for aaf if enabled"
authorBorislav Glozman <Borislav.Glozman@amdocs.com>
Thu, 8 Nov 2018 07:01:24 +0000 (07:01 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 8 Nov 2018 07:01:24 +0000 (07:01 +0000)

Trivial merge