Merge "SOTN issue fixes"
authorDan Timoney <dt5972@att.com>
Thu, 9 Aug 2018 20:37:04 +0000 (20:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 9 Aug 2018 20:37:04 +0000 (20:37 +0000)
Former-commit-id: 7b72cc062552903fa642002f8642ef5bd8e434a0


Trivial merge