Reorder web filters to match SFDC requirements and fix tests to work with different order

https://gus.my.salesforce.com/apex/adm_bugdetail?id=a07B00000010ich&sfdc.override=1

@bug W-2358142@
@P4CL:9214641@

@rev goliver@
Merging origin/aballard/master-pending-fix-sfdc-tests into master