Pre development branch merge request to development

Pre-development branch has been uploaded and remediated all findings except baseimage findings (ubi8.3).