[CXF-5311] Minor modifications and reverting a previous 'fix' to RSA helpers