Use deploytools env.
remove watermarked addons (bug 882949)