Some further changes to FederatedStore post-Maestro; including improvements to Aggregation.

Temporarily some non-federation issues are also assigned to this alpha. These may be deferred to later alphas as our planning evolves. They won't be done any sooner than alpha5.