Bring in most recent DNS, CBS and newer version of fog.

Sync with upstream