JBIDE-13678 add forge.ext to updatesite
Should not have class overlap
Fix test failure
Fix more duplicate classes