Merge "Fuel 7.0 rebase" into experimental
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Tue, 27 Oct 2015 14:04:55 +0000 (14:04 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 27 Oct 2015 14:04:55 +0000 (14:04 +0000)

Trivial merge