Merge "bug fix: when running manually a test, get stuck in echo"
authorJose Lausuch <jose.lausuch@ericsson.com>
Fri, 22 Jan 2016 16:29:11 +0000 (16:29 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 22 Jan 2016 16:29:11 +0000 (16:29 +0000)

Trivial merge