Merge "synching up SO 1.1"
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>
Fri, 22 Sep 2017 17:59:30 +0000 (17:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Sep 2017 17:59:30 +0000 (17:59 +0000)

Trivial merge