merge OS-FEDERATION objects together

this avoids using using colons in keys, which cannot be used in XML tag
names

Change-Id: Iac866c7071d7e7e27478cae51f2bc8cc0363e68f
Closes-Bug: 1294150