LPS-41528 Copy from portal
LPS-41528 LPS-41528 Change name and address order
LPS-41528 Update from portal
LRDCOM-8409: Update SO Metadata to latest hash (reverse-merged from commit 3854ca58e47586cd193d8605579e3d9742591e61)
Partial reverse-merge for calendar-portlet LRDCOM-8409: Metadata update (reverse-merged from commit 65b37b224c6e1d76c78f8ebe56c5dff95d20eb6d)
LRDCOM-8409: Update to latest hash
LRDCOM-8409: SO Metadata update to latest hash
CLDSVCS-476 Fix compile error