Fix regression with cfg CLI arguments
Fix regression with cfg CLI arguments

Fixes bug #1082279

Only options registered using register_cli_opt() should be available via
the CLI, but since e42276a all options are added to the CLI.

Also modify one of the existing unit tests to catch this problem.

Change-Id: I742a4ae4e0fc17cd9ae5e4424c2edd38e2bc50a2

JioCloud/pbr,varunarya10/pbr,openstack-dev/pbr,klmitch/pbr,WiFast/pbr,klmitch/pbr,openstack-dev/pbr,JioCloud/pbr,citrix-openstack-build/pbr,WiFast/pbr,openstack-dev/pbr,redhat-openstack/pbr,redhat-openstack/pbr,citrix-openstack-build/pbr,varunarya10/pbr,emonty/oslo-packaging,citrix-openstack-build/pbr,emonty/oslo-packaging