NXP-11446 Improve Variable Extractor

Conflicts:
	nuxeo-template-rendering-core/src/main/java/org/nuxeo/template/service/TemplateProcessorComponent.java