merged master into DocumentTemplates

.liquibase/Data_alias/basic/2019.2.1/changelog.xml

@@ -12,8 +12,6 @@
     <include relativeToChangelogFile="true" file="alter_BulkMailRecipient_problem.xml"/>
     <include relativeToChangelogFile="true" file="insert_BulkMailProblem_keyword.xml"/>
     
-    <include relativeToChangelogFile="true" file="update_assistance_attributes.xml"/>
-    
     <include relativeToChangelogFile="true" file="alter_DocumentTemplate_addReplacementName.xml"/>
     <include relativeToChangelogFile="true" file="insert_DocumentTemplateCategory_templates.xml"/>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2019.3.0/changelog.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="update_assistance_attributes.xml"/>
+</databaseChangeLog>

.liquibase/Data_alias/changelog.xml

@@ -3,6 +3,7 @@
     <include relativeToChangelogFile="true" file="basic/init/init.xml"/>
     <include relativeToChangelogFile="true" file="basic/2019.1.4/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2019.2.1/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2019.3.0/changelog.xml"/>
     
     <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file