Merge "Move code from c.a.server.location.timezone" into sc-dev