Adding conditions for cache expiration on blocks. Now the blocks can specify if they shall be expired on changes of articles and categories.
Merge branches 'ActionItem2860' and 'stable' into stable