Merge "Removal of powermock injection in WAR"
authorChristophe Closset <cc697w@intl.att.com>
Fri, 10 Feb 2017 15:05:36 +0000 (15:05 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Fri, 10 Feb 2017 15:05:36 +0000 (15:05 +0000)

Trivial merge