Merge "Sync with upstream repository"
authorMichal Skalski <mskalski@mirantis.com>
Wed, 3 Feb 2016 08:17:45 +0000 (08:17 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Feb 2016 08:17:45 +0000 (08:17 +0000)

Trivial merge