SOS-2156

currently on master i dont think social office will deploy since the calendar portlet isnt compiling... but you can cherry pick this to 6.2.x if you want to test it out