Merge "Updated license information"
authorSofia Wallin <sofia.wallin@ericsson.com>
Fri, 19 May 2017 12:53:18 +0000 (12:53 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 19 May 2017 12:53:18 +0000 (12:53 +0000)

Trivial merge