Improving the add-ons generator to deal with apps (bug 1080145)

Cancel and replace PR#320
I spent quite some time trying to figure out why I need to create these 2 images and I wasn't able to generate only one. There is an issue related to the fact that we call tasks and some are not finished on time when we try to reach the image…