Merge master into feature/statbilization branch
SOC-3913: socialWidgetResources doesn't work
SOC-3959: Social Widget doesn't have latest Activity Stream
SOC-3959: Use official logo eXo
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/upgrade-gatein-3.7.x