SSP-1668 Fix tests broken by switch from data to app attrib config
Merge branch 'SSP-1668-attrib-canonicalization' into ssp-master