Partial reverse merge for sync-web LRDCOM-7679: Metadata update
Partial reverse merge for calendar-portlet LRDCOM-7430: Metadata update
LRDCOM-7687: Update properties