Removed extraneous escaping from TemplateHelper::parseAttributeValueTemplate()
Fixed the unintended unescaping of entities in literals inside of inline XPath expressions by TemplateOptimizer::optimize()