Upstream merge + remove 3 pulled patches.
Update Physics When Updating Attachables
Only update Attachable's when applyPhysics is true
Update Inventory and Health for PlayerConsumeItemEvent
Nerf the Zombie Lag issues in MC 1.6 - Fixes MC-17630
Merge remote branch 'upstream/master'