Fix a double trailing endif in full_metadata.xml
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement