923112 - Katello Nightly : Add,Apply.Remove default custom info
keynames for subscriptions that are set at the organization level failed
via Cli
(cherry picked from commit ad57ee9a431321aeb64e68d805abeb5ec1c93c3d)

Conflicts:
	src/spec/controllers/api/organization_default_info_controller_spec.rb
super happy tests