Merge "Align changes to Amsterdam"
authorOfir Sonsino <os0695@att.com>
Sun, 3 Dec 2017 15:43:14 +0000 (15:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 3 Dec 2017 15:43:14 +0000 (15:43 +0000)

Trivial merge