Merge Addon and Webapp models (bug 1006907)