Do not let 'id' value end with '.'.
Change 'Catalog' to 'THREDDS' in service name.
Merge branch 'solr4new' of github.com:ESGF/esg-search into solr4new