Merge branch 'jk/skip-http-tests-under-no-curl' into maint