Added promotions to product page cache key
Added promotions to product page cache key

Fixes #6539
Fixes #6557

Conflicts:
	frontend/app/views/spree/products/show.html.erb

Conflicts:
	frontend/app/views/spree/products/show.html.erb

alejandromangione/spree,ayb/spree,nooysters/spree,softr8/spree,CiscoCloud/spree,calvinl/spree,robodisco/spree,grzlus/spree,AgilTec/spree,maybii/spree,edgward/spree,JuandGirald/spree,jimblesm/spree,lsirivong/spree,CiscoCloud/spree,patdec/spree,caiqinghua/spree,omarsar/spree,wolfieorama/spree,njerrywerry/spree,tomash/spree,yushine/spree,hifly/spree,lsirivong/spree,FadliKun/spree,lsirivong/spree,AgilTec/spree,jeffboulet/spree,jasonfb/spree,groundctrl/spree,beni55/spree,reidblomquist/spree,groundctrl/spree,piousbox/spree,brchristian/spree,vinayvinsol/spree,zamiang/spree,edgward/spree,jimblesm/spree,SadTreeFriends/spree,alvinjean/spree,TimurTarasenko/spree,karlitxo/spree,groundctrl/spree,sfcgeorge/spree,gregoryrikson/spree-sample,ramkumar-kr/spree,patdec/spree,alejandromangione/spree,rajeevriitm/spree,pervino/spree,sliaquat/spree,beni55/spree,vinsol/spree,sfcgeorge/spree,shaywood2/spree,locomotivapro/spree,yiqing95/spree,KMikhaylovCTG/spree,KMikhaylovCTG/spree,jeffboulet/spree,vcavallo/spree,odk211/spree,alvinjean/spree,calvinl/spree,trigrass2/spree,robodisco/spree,njerrywerry/spree,useiichi/spree,CJMrozek/spree,brchristian/spree,pulkit21/spree,grzlus/spree,JuandGirald/spree,KMikhaylovCTG/spree,siddharth28/spree,welitonfreitas/spree,jaspreet21anand/spree,grzlus/spree,tancnle/spree,robodisco/spree,wolfieorama/spree,tancnle/spree,moneyspyder/spree,progsri/spree,mleglise/spree,wolfieorama/spree,trigrass2/spree,siddharth28/spree,Kagetsuki/spree,tomash/spree,azranel/spree,moneyspyder/spree,yiqing95/spree,vcavallo/spree,jparr/spree,tomash/spree,firman/spree,karlitxo/spree,berkes/spree,njerrywerry/spree,kewaunited/spree,ahmetabdi/spree,brchristian/spree,AgilTec/spree,APohio/spree,sfcgeorge/spree,pervino/spree,DarkoP/spree,TimurTarasenko/spree,zaeznet/spree,vmatekole/spree,yushine/spree,calvinl/spree,priyank-gupta/spree,volpejoaquin/spree,shekibobo/spree,vmatekole/spree,pervino/spree,vcavallo/spree,locomotivapro/spree,vinsol/spree,pulkit21/spree,omarsar/spree,TimurTarasenko/spree,KMikhaylovCTG/spree,DynamoMTL/spree,maybii/spree,gregoryrikson/spree-sample,alejandromangione/spree,DarkoP/spree,vcavallo/spree,joanblake/spree,raow/spree,DynamoMTL/spree,useiichi/spree,raow/spree,reidblomquist/spree,shekibobo/spree,jparr/spree,SadTreeFriends/spree,berkes/spree,vinsol/spree,orenf/spree,odk211/spree,fahidnasir/spree,caiqinghua/spree,JDutil/spree,beni55/spree,zamiang/spree,jimblesm/spree,nooysters/spree,jasonfb/spree,AgilTec/spree,welitonfreitas/spree,sliaquat/spree,vinayvinsol/spree,joanblake/spree,locomotivapro/spree,orenf/spree,jasonfb/spree,cutefrank/spree,kewaunited/spree,NerdsvilleCEO/spree,progsri/spree,alvinjean/spree,azranel/spree,hoanghiep90/spree,reidblomquist/spree,miyazawatomoka/spree,CJMrozek/spree,ahmetabdi/spree,TrialGuides/spree,jimblesm/spree,priyank-gupta/spree,Hawaiideveloper/shoppingcart,pervino/spree,hifly/spree,ahmetabdi/spree,Kagetsuki/spree,SadTreeFriends/spree,jparr/spree,abhishekjain16/spree,alvinjean/spree,rajeevriitm/spree,Hawaiideveloper/shoppingcart,mindvolt/spree,CJMrozek/spree,hoanghiep90/spree,JDutil/spree,quentinuys/spree,vinayvinsol/spree,shekibobo/spree,TimurTarasenko/spree,ramkumar-kr/spree,Kagetsuki/spree,gregoryrikson/spree-sample,imella/spree,softr8/spree,welitonfreitas/spree,pulkit21/spree,Kagetsuki/spree,nooysters/spree,imella/spree,mindvolt/spree,edgward/spree,lyzxsc/spree,jparr/spree,robodisco/spree,priyank-gupta/spree,yiqing95/spree,hifly/spree,jeffboulet/spree,patdec/spree,nooysters/spree,moneyspyder/spree,orenf/spree,maybii/spree,caiqinghua/spree,volpejoaquin/spree,JuandGirald/spree,tomash/spree,jaspreet21anand/spree,siddharth28/spree,Hawaiideveloper/shoppingcart,mleglise/spree,mindvolt/spree,ayb/spree,cutefrank/spree,lsirivong/spree,quentinuys/spree,TrialGuides/spree,welitonfreitas/spree,mindvolt/spree,miyazawatomoka/spree,abhishekjain16/spree,SadTreeFriends/spree,vinsol/spree,ayb/spree,moneyspyder/spree,ahmetabdi/spree,NerdsvilleCEO/spree,FadliKun/spree,patdec/spree,omarsar/spree,zamiang/spree,piousbox/spree,shaywood2/spree,gautamsawhney/spree,jasonfb/spree,maybii/spree,yiqing95/spree,hifly/spree,lyzxsc/spree,NerdsvilleCEO/spree,miyazawatomoka/spree,fahidnasir/spree,calvinl/spree,volpejoaquin/spree,berkes/spree,piousbox/spree,brchristian/spree,shekibobo/spree,yushine/spree,softr8/spree,fahidnasir/spree,rakibulislam/spree,cutefrank/spree,reidblomquist/spree,grzlus/spree,volpejoaquin/spree,sliaquat/spree,raow/spree,karlitxo/spree,useiichi/spree,dafontaine/spree,azranel/spree,vinayvinsol/spree,caiqinghua/spree,lyzxsc/spree,rakibulislam/spree,kewaunited/spree,piousbox/spree,CiscoCloud/spree,DynamoMTL/spree,shaywood2/spree,DarkoP/spree,dafontaine/spree,rajeevriitm/spree,TrialGuides/spree,vmatekole/spree,berkes/spree,jaspreet21anand/spree,APohio/spree,CJMrozek/spree,trigrass2/spree,APohio/spree,tancnle/spree,ramkumar-kr/spree,zaeznet/spree,rajeevriitm/spree,azranel/spree,abhishekjain16/spree,JuandGirald/spree,njerrywerry/spree,edgward/spree,imella/spree,joanblake/spree,abhishekjain16/spree,DarkoP/spree,fahidnasir/spree,miyazawatomoka/spree,trigrass2/spree,progsri/spree,FadliKun/spree,omarsar/spree,odk211/spree,locomotivapro/spree,zamiang/spree,mleglise/spree,NerdsvilleCEO/spree,alejandromangione/spree,TrialGuides/spree,ayb/spree,orenf/spree,pulkit21/spree,gregoryrikson/spree-sample,dafontaine/spree,wolfieorama/spree,groundctrl/spree,vmatekole/spree,karlitxo/spree,siddharth28/spree,APohio/spree,zaeznet/spree,sliaquat/spree,rakibulislam/spree,dafontaine/spree,yushine/spree,quentinuys/spree,DynamoMTL/spree,lyzxsc/spree,priyank-gupta/spree,JDutil/spree,hoanghiep90/spree,gautamsawhney/spree,jaspreet21anand/spree,firman/spree,FadliKun/spree,softr8/spree,beni55/spree,joanblake/spree,gautamsawhney/spree,ramkumar-kr/spree,raow/spree,hoanghiep90/spree,sfcgeorge/spree,rakibulislam/spree,firman/spree,JDutil/spree,gautamsawhney/spree,mleglise/spree,CiscoCloud/spree,quentinuys/spree,cutefrank/spree,useiichi/spree,zaeznet/spree,tancnle/spree,firman/spree,odk211/spree,Hawaiideveloper/shoppingcart,progsri/spree,shaywood2/spree,jeffboulet/spree,kewaunited/spree