Combo Servlet updates to include resources from plugins