W-21432256: Few follow up fixes to address Basket V2-V1 gaps and content security policy headers

W-21432256: Few follow up fixes to address Basket V2-V1 gaps and content security policy headers #2583