Merge "Add proxy support"
authorDan Timoney <dtimoney@att.com>
Sat, 1 Jul 2017 23:07:51 +0000 (23:07 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 1 Jul 2017 23:07:51 +0000 (23:07 +0000)
Former-commit-id: cee38293eb9f404449769c75c9ad107f639d373b


Trivial merge