Merge "Align HCI environment file with list of services from roles_data" into stable...