Merge "Fix promise test output" into stable/brahmaputra
authorjose.lausuch <jose.lausuch@ericsson.com>
Thu, 28 Jan 2016 08:16:51 +0000 (08:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 28 Jan 2016 08:16:51 +0000 (08:16 +0000)

Trivial merge