#4962 added @ and % to regexp
#4960
#4960
fixes #4960
fixes #4945
#4945
Merge remote-tracking branch 'origin/master' into issue-4965-Wrong-packages-in-ESAPI.properties
#4965