Trim whitespace from link property names
Merge branch 'master' into jstl-site