cli: collection-based-options could be passed in 2 ways(#859684)

Collection based options can be passwd without the xml type prefix.
Both boot.dev=hd and dev=hd as value for --os-boot work. Only the first
one bood.dev=hd is a valid value for the option --os-boot.

Change-Id: Ic20ec38e3d08061dd33dd81b8d4b49cb1f5c2b79
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859684
Signed-off-by: Ravi Nori <rnori@redhat.com>