Merge branch 'release/2.0'

# Conflicts:
#	RFXtoRP_HsaCons.ftl
#	RFXtoRP_HsaDispute_Created.ftl
#	RFXtoRP_HsrPrepa.ftl
#	VERSION

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -11,11 +11,7 @@
     },
     "Payload": {
       "Name": "${carrier.carrier_designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": true,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
 
     <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
 
@@ -37,7 +33,6 @@
           </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
-
         <#-- if Reflex WMS address is not structured    -->
         <#else>
           <#if  carrier.address??>