Initial set of changes to align with general CloudForms team standards.