Create explicit Locations.

Part of STUD-1030

@dmitchell Please review. This contains the changes for CMS only.