Use Chest block state for trapped chests. Fixes BUKKIT-3762
Merge remote-tracking branch 'upstream/master' into sakura150