Merge "Sync with recent changes in fuel-main"
authorMichal Skalski <mskalski@mirantis.com>
Mon, 25 Jan 2016 23:26:03 +0000 (23:26 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 25 Jan 2016 23:26:03 +0000 (23:26 +0000)

Trivial merge