Update sql-database-elastic-scale-federation-migration.md

Correct the ALTER FEDERATION link to point to the correct MSDN page.
resolve merge conflict
Merge pull request #2268 from cjgronlund/merge-cg

Fixed merge conflict