CLC-3571: CFV - Remove html tags depending on the apiVersion
https://jira.ets.berkeley.edu/jira/browse/CLC-3571
Merge pull request #2435 from christianv/CLC-3571

CLC-3571: CFV - Remove html tags depending on the apiVersion