Merge "Adding Labels" into stable/danube
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>
Thu, 16 Mar 2017 12:28:30 +0000 (12:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 16 Mar 2017 12:28:30 +0000 (12:28 +0000)

Trivial merge