Attempt to fix metadata validation errors, layer_link checks for service links...
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement