Merge "Fuel 7.0 rebase"
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Thu, 19 Nov 2015 12:31:50 +0000 (12:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 19 Nov 2015 12:31:50 +0000 (12:31 +0000)

Trivial merge