Merge "modfied to mute object storage test on joid."
authorvalentin boucher <valentin.boucher@orange.com>
Tue, 2 Aug 2016 18:59:43 +0000 (18:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 2 Aug 2016 18:59:43 +0000 (18:59 +0000)

Trivial merge