Nils Adermann 97ec2d7b61 Merge remote-tracking branch 'github-composer/2.0' into solve-without-installed %!s(int64=6) %!d(string=hai) anos
..
functional 422a9adb07 images related to new trusty images %!s(int64=8) %!d(string=hai) anos
installer 97ec2d7b61 Merge remote-tracking branch 'github-composer/2.0' into solve-without-installed %!s(int64=6) %!d(string=hai) anos