This is a finer pass at merge conflicts resolutions and documentation mismatches since the slb codebase was transferred to gitlab.
Changes are more in the documentation and the CICD than the code itself - mainly about removing references to the entitlement service we're not using directly anymore.