Merge "Update configurations"
authorRuan HE <ruan.he@orange.com>
Mon, 8 Aug 2016 15:34:13 +0000 (15:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 8 Aug 2016 15:34:13 +0000 (15:34 +0000)

Trivial merge