Merge "Change the way the data strings are replaced to allow similar variables on...
authorRuan HE <ruan.he@orange.com>
Fri, 18 Sep 2015 10:24:31 +0000 (10:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 18 Sep 2015 10:24:31 +0000 (10:24 +0000)

Trivial merge