Merge "add ftpes"
authorGary Wu <gary.i.wu@huawei.com>
Fri, 14 Sep 2018 17:23:19 +0000 (17:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 14 Sep 2018 17:23:19 +0000 (17:23 +0000)

Trivial merge