BROKER_ names changes to CM_ CB_ etc
spelling
Merge branch 'feature/499_basic_ctx_providers' into hardening/change_names_in_testEnv
Merge pull request #525 from telefonicaid/hardening/change_names_in_testEnv

Hardening/change names in test env