CLOUD-2477 updates for consolidated modules

[rcernich]

Signed-off-by: rcernich rcernich@redhat.com

Thanks for submitting your Pull Request!

Please make sure your PR meets the following requirements:

• Pull Request title is properly formatted: [CLOUD-XYA] Subject
• Pull Request contains link to the JIRA issue
• Pull Request contains description of the issue
• Pull Request does not include fixes for issues other than the main ticket
• Attached commits represent units of work and are properly formatted
• You have read and agreed to the Developer Certificate of Origin (DCO) (see CONTRIBUTING.md)
• Every commit contains Signed-off-by: Your Name <yourname@example.com> - use git commit -s

[osnipso]

LGTM, merging.