Test removing if statements from the ogc_wfs and ogc_wcs blocks
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement