Fixes bug where global blocks cache settings were ignored. Looks like the intent was to grab global blocks and merge with local, but we didn't save the resulting merged array.
Fixes bug where global blocks cache settings were ignored.
Looks like the intent was to grab global blocks and merge with local, but we didn't save the resulting merged array.


Former-commit-id: 1c92391f3e45f8875b119d9a3d305f0824b24779
Former-commit-id: 8ead020efe70288bed84325d20a41af4dc637ac1
mlocati/concrete5,mainio/concrete5,MrKarlDilkington/concrete5,concrete5/concrete5,hissy/concrete5,jaromirdalecky/concrete5,rikzuiderlicht/concrete5,haeflimi/concrete5,mlocati/concrete5,jaromirdalecky/concrete5,rikzuiderlicht/concrete5,mainio/concrete5,jaromirdalecky/concrete5,deek87/concrete5,mainio/concrete5,KorvinSzanto/concrete5,triplei/concrete5-8,triplei/concrete5-8,biplobice/concrete5,haeflimi/concrete5,haeflimi/concrete5,olsgreen/concrete5,mlocati/concrete5,concrete5/concrete5,biplobice/concrete5,acliss19xx/concrete5,deek87/concrete5,MrKarlDilkington/concrete5,hissy/concrete5,MrKarlDilkington/concrete5,concrete5/concrete5,olsgreen/concrete5,olsgreen/concrete5,biplobice/concrete5,a3020/concrete5,rikzuiderlicht/concrete5,deek87/concrete5,hissy/concrete5,KorvinSzanto/concrete5,haeflimi/concrete5,jaromirdalecky/concrete5,acliss19xx/concrete5,hissy/concrete5,mlocati/concrete5,acliss19xx/concrete5,KorvinSzanto/concrete5,biplobice/concrete5,concrete5/concrete5,triplei/concrete5-8,deek87/concrete5,a3020/concrete5