Removing hyphen from token-name and token-value tags to support the tags in freemaker templates.

In freemarker, if the tag name contains hyphen character, it is discarding it.
We are getting the below error when using this.

Expression csrf.token is not numerical Expression value is not numerical The problematic instruction: ---------- ==> user-directive csrf.token-value