Merge "Create a flag in the tests to indicate if they should be blocking or not"
authorjose.lausuch <jose.lausuch@ericsson.com>
Mon, 25 Jul 2016 11:42:07 +0000 (11:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 25 Jul 2016 11:42:07 +0000 (11:42 +0000)

Trivial merge