Merge "Support 2.4.0 release branch"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Fri, 25 May 2018 17:25:59 +0000 (17:25 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 25 May 2018 17:25:59 +0000 (17:25 +0000)

Trivial merge