Upstream - Ench Table fixes and bukkit method for EAR