Merge "Fixup federation deployment"