Return lang_merge() to SimpleSAML_XHTML_Template, as it was public, and mark...

Return lang_merge() to SimpleSAML_XHTML_Template, as it was public, and mark it as deprecated. Use array_merge_recursive() instead.