Merge branch 'master' into protocol-version2

diff --cc test/Makefile.am
index aaa63bd,fa77aeb..f00be58
--- 1/test/Makefile.am
--- 2/test/Makefile.am
+++ b/test/Makefile.am
@@@ -18,14 -16,8 +18,15 @@@ EXTRA_DIST = run_pazpar2.sh marc21_test
        test_url.cfg test_url.urls \
        test_filter.cfg test_filter.urls \
        test_termlist_block.cfg test_termlist_block.urls \
 +      test_facets_settings_1.xml  test_facets_settings_2.xml \
 +      test_url_service.xml  test_url_settings_1.xml  test_url_settings_2.xml  test_url_settings_3.xml  test_url_settings_4.xml \
 +      test_limit_limitmap.cfg test_limit_limitmap.urls \
 +      test_limit_limitmap_service.xml \
 +      test_limit_limitmap_setting_1.xml test_limit_limitmap_setting_2.xml \
 +      test_limit_limitmap_setting_3.xml test_limit_limitmap_setting_4.xml \
 +      test_limit_limitmap_setting_5.xml \
        ztest_localhost_settings.xml test_termlist_block_settings_2.xml \
+       test_facets_settings_1.xml test_facets_settings_2.xml \
        $(check_SCRIPTS)
  
  TESTS = $(check_SCRIPTS)