Merge "Fixed resources not being released, code cleanup"
authorVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>
Mon, 23 Oct 2017 11:22:15 +0000 (11:22 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 23 Oct 2017 11:22:15 +0000 (11:22 +0000)

Trivial merge