Merge updates for 2.1 Milestone from staging repo to prod repo

This merges the updates for the Developer Website 2.1 milestone into the public facing repo from the private staging repo.