Moved non-generic matches from kiln/sitemaps/solr.xmap to sitemaps/solr.xmap. Fixes WS-41.