SOS-1913 Don't interpret activities for assets in trash
LPS-42073 Apply changes to portlets
LPS-42137 Send site membership request to portal admin when there is no site admin
LPS-42137 Apply same fix to organization requests
LPS-42137 Source formatting
Merge branch 'master' of https://github.com/liferay/liferay-plugins