Merge "Update and clean configuration files"
authorRuan HE <ruan.he@orange.com>
Wed, 29 Nov 2017 12:07:47 +0000 (12:07 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 29 Nov 2017 12:07:47 +0000 (12:07 +0000)

Trivial merge