Add the ability to merge distro settings from the persona/origins

For when its needed to specify specific overrides for the distro
configuration due to a specific openstack release having certain
known issues add a way for this to occur.

Change-Id: Ib0534cc58c2d2c514a77881b608d51505c2849db
Merge "Add the ability to merge distro settings from the persona/origins"