Apply usa-sr-classes everywhere
#1958

hbillings wants to merge 1957-apply-sr-classes into develop

We do not currently have an analysis of these two commits