CLC-4443 DRY the static assets setting
Merge pull request #3107 from raydavis/raywip

CLC-4443 DRY the static assets setting