WICKET-5055
Simplify a regex: [a-zA-Z0-9_] == \w
Fix a JSHint warning - remove trailing whitespace