Merge "Trying using the downstream-merge-java template"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Fri, 17 Feb 2017 14:53:50 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Fri, 17 Feb 2017 14:53:50 +0000 (14:53 +0000)

Trivial merge