896147 - Notify user of keyname presence when adding
default_system_info to an org
making tests happy
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
Merge pull request #1780 from komidore64/default_info_dupe

two bug fixes around default_info along with tests