Merge "Revert "Fix defect SO-36""
authorRob Daugherty <rd472p@att.com>
Wed, 18 Oct 2017 18:00:00 +0000 (18:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 18 Oct 2017 18:00:00 +0000 (18:00 +0000)

Trivial merge