Merge "Fix issues in resubmit"
authorVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>
Sun, 22 Oct 2017 14:51:51 +0000 (14:51 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 22 Oct 2017 14:51:51 +0000 (14:51 +0000)

Trivial merge