Merge "Colorado 2.0 updates"
authorSofia Wallin <sofia.wallin@ericsson.com>
Tue, 8 Nov 2016 10:21:23 +0000 (10:21 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 8 Nov 2016 10:21:23 +0000 (10:21 +0000)

Trivial merge