If a Mage_Catalog_Block_Product_Abstract based block contains a product, use the product ID to genewrate the cache key.
exclude blocks that inherit from the Mage_Catalog_Block_Product_Abstract block
Merge remote-tracking branch 'origin/master' into models