Merge "Dev Tested with SO"
authorDan Timoney <dtimoney@att.com>
Fri, 10 Nov 2017 18:24:15 +0000 (18:24 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 10 Nov 2017 18:24:15 +0000 (18:24 +0000)
Former-commit-id: 25c925381fe5b9c95e9221099daa5dd23791cc3f


Trivial merge