LPS-39955

LPS-39955 Needs another commit to SAML portlet which will be sent after this one is accepted so don't close the ticket yet