Merge branch 'gg-r4b-work-2' of https://github.com/HL7/fhir

ivy.xml

@@ -5,14 +5,14 @@
 		<dependency org="ca.uhn.hapi.fhir" name="hapi-fhir-base" rev="4.0.0"/>
 		<!-- HAPI FHIR Core -->
 
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.utilities" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu2" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu2016may" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu3" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.r4" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.r5" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.convertors" rev="5.2.16"/>
-		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.validation" rev="5.2.16"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.utilities" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu2" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu2016may" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.dstu3" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.r4" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.r5" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.convertors" rev="5.2.17-SNAPSHOT"/>
+		<dependency org="ca.uhn.hapi.fhir" name="org.hl7.fhir.validation" rev="5.2.17-SNAPSHOT"/>
 
 		<dependency org="ch.qos.logback" name="logback-classic" rev="1.2.3" />
 		<dependency org="com.google.code.gson" name="gson" rev="2.8.5"/>

source/account/bundle-Account-search-params.xml

@@ -107,7 +107,7 @@
       <SearchParameter>
         <id value="Account-status"/>
         <extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status">
-          <valueCode value="normative"/>
+          <valueCode value="trial-use"/>
         </extension>
         <extension url="http://hl7.org/fhir/build/StructureDefinition/path">
           <valueString value="Account.status"/>

source/account/structuredefinition-Account.xml

@@ -115,10 +115,8 @@
         <extension url="http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName">
           <valueString value="AccountStatus"/>
         </extension>
-        <extension url="http://hl7.org/fhir/build/StructureDefinition/definition">
-          <valueString value="Indicates whether the account is available to be used."/>
-        </extension>
         <strength value="required"/>
+        <description value="Indicates whether the account is available to be used."/>
         <valueSet value="http://hl7.org/fhir/ValueSet/account-status"/>
       </binding>
       <mapping>
@@ -144,10 +142,8 @@
         <extension url="http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName">
           <valueString value="AccountType"/>
         </extension>
-        <extension url="http://hl7.org/fhir/build/StructureDefinition/definition">
-          <valueString value="The usage type of this account, permits categorization of accounts."/>
-        </extension>
         <strength value="example"/>
+        <description value="The usage type of this account, permits categorization of accounts."/>
         <valueSet value="http://hl7.org/fhir/ValueSet/account-type"/>
       </binding>
       <mapping>

source/activitydefinition/list-ActivityDefinition-packs.xml

@@ -4,11 +4,6 @@
   <id value="ActivityDefinition-packs"/>
   <status value="current"/>
   <mode value="working"/>
-  <entry>
-    <item>
-      <reference value="ImplementationGuide/ActivityDefinition-core"/>
-    </item>
-  </entry>
   <entry>
     <item>
       <reference value="ImplementationGuide/ActivityDefinition-cqf"/>