Merge branch 'master' into search-coord-thread-pool

Conflicts:
	src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java

src/main/resources/application.yaml

@@ -36,6 +36,12 @@ spring:
 
 hapi:
   fhir:
+    ### enable to use the ApacheProxyAddressStrategy which uses X-Forwarded-* headers
+    ### to determine the FHIR server address
+#   use_apache_address_strategy: false
+    ### forces the use of the https:// protocol for the returned server address.
+    ### alternatively, it may be set using the X-Forwarded-Proto header.
+#   use_apache_address_strategy_https: false
     ### enable to set the Server URL
 #    server_address: http://hapi.fhir.org/baseR4
     ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5