Merge origins components

Also merge in any component origin settings so that
these options can be used through the rest of the
system.

Origin specific options are useful to be able to
target options to a specific origin/release, for
example to make a havana release have a specific
rpm option, while leaving the other origins to not
have this option.

Change-Id: I11aca326c3e715427963e0c881d78c85e17c1ffd
Ensure release is a string type

Allow the release to be a integer or non-numeric
type and convert it to a string type only when needed.

Change-Id: Ia62236dc5f3841642b5a5b831c6525074a8fe807