Merge "Upgrade mockito to v2; drop incompatible powermock"
authorOfir Sonsino <ofir.sonsino@intl.att.com>
Wed, 28 Nov 2018 09:15:09 +0000 (09:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 28 Nov 2018 09:15:09 +0000 (09:15 +0000)

Trivial merge