Merge "ves collector related"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Mon, 20 Feb 2017 20:43:17 +0000 (20:43 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Mon, 20 Feb 2017 20:43:17 +0000 (20:43 +0000)

Trivial merge