Merge "Autodeployment adaptation to Fuel 7"
authorStefan Berg <stefan.k.berg@ericsson.com>
Thu, 19 Nov 2015 12:32:18 +0000 (12:32 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 19 Nov 2015 12:32:18 +0000 (12:32 +0000)

Trivial merge