Merge "Fix Robot framework branch"
authorGary Wu <gary.i.wu@huawei.com>
Fri, 8 Dec 2017 18:39:47 +0000 (18:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 8 Dec 2017 18:39:47 +0000 (18:39 +0000)

Trivial merge