Merge "Update FProxy to separate truststore and keystore"
authorJonathan Gathman <jonathan.gathman@att.com>
Mon, 12 Nov 2018 13:09:41 +0000 (13:09 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 12 Nov 2018 13:09:41 +0000 (13:09 +0000)

Trivial merge