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

Cancel and replace PR#320
Same as above