Merge "Fix the javadocs error in jenkins"
authorJames Forsyth <jf2512@att.com>
Mon, 21 Aug 2017 16:24:52 +0000 (16:24 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 21 Aug 2017 16:24:52 +0000 (16:24 +0000)

Trivial merge