SOS-1638

Moving all the non portal props to portlet props