SOS-1638 Move non portal props to portlet props.
SOS-1638 Handle null case for extraData
SOS-1638 SF
LPS-26366 Everytime we regenerate the tmp folder we need to put a correct id in the portlet.xml file
LPS-26366 SF