Merge branch '2021.2' into 'master'

.liquibase/Data_alias/basic/2021.2.2/Ticket/changelog.xml

...ata_alias/basic/2021.2.2/Ticket/update_ticketCategory.xml

.liquibase/Data_alias/basic/2021.2.2/add_offer_showprice.xml

.liquibase/Data_alias/basic/2021.2.2/changelog.xml

.liquibase/Data_alias/changelog.xml

aliasDefinition/Data_alias/Data_alias.aod

...lds/product_id/customproperties/translate4log/property.js

...nisationobjects/children/objecttype_param/valueProcess.js

...s/personobjects/children/objecttype_param/valueProcess.js

...360Degree_entity/recordcontainers/jdito/contentProcess.js

entity/Activity_entity/Activity_entity.aod

entity/AdvertisingItem_entity/AdvertisingItem_entity.aod

...ngItem_entity/entityfields/advertising_id/stateProcess.js

...rdfieldmappings/advertising_id.displayvalue/expression.js

entity/Appointment_entity/recordcontainers/jdito/onUpdate.js

...il_entity/entityfields/newmosaicotemplate/stateProcess.js

.../BulkMail_entity/recordcontainers/db/fromClauseProcess.js

...ldmappings/employee_contact_id.displayvalue/expression.js

...CampaignParticipant_entity/CampaignParticipant_entity.aod

...rticipant_entity/recordcontainers/db/fromClauseProcess.js