Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
#	src/main/resources/hapi.properties
#	src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java

src/main/resources/hapi.properties

@@ -8,10 +8,16 @@ fhir_version=R4
 # server, put the DNS name of that server here.
 server_address=http://localhost:8080/fhir/
 
+# For Jetty, use this:
+# server_address=http://localhost:8080/hapi-fhir-jpaserver/fhir/
+
 # This is the context path for the FHIR endpoint. If this is changed, the
 # setting above should also be changed.
 server.base=/fhir
 
+# For Jetty, use this:
+# server.base=/hapi-fhir-jpaserver/fhir
+
 default_encoding=JSON
 etag_support=ENABLED
 default_page_size=20
@@ -32,8 +38,6 @@ datasource.password=fhirPass
 server.name=Local Tester
 server.id=home
 test.port=
-subscription.email.enabled=true
-subscription.resthook.enabled=true
 hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 hibernate.search.model_mapping=ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory
 hibernate.format_sql=false
@@ -48,3 +52,17 @@ hibernate.search.default.directory_provider=filesystem
 hibernate.search.default.indexBase=target/lucenefiles
 hibernate.search.lucene_version=LUCENE_CURRENT
 tester.config.refuse_to_fetch_third_party_urls=false
+
+
+##################################################
+# Subscriptions
+##################################################
+
+# Enable REST Hook Subscription Channel
+subscription.resthook.enabled=true
+
+# Enable Email Subscription Channel
+subscription.email.enabled=false
+
+# Enable Websocket Subscription Channel
+subscription.websocket.enabled=false