Remove remaining inter-DC references.

Remove the remaining inter-DC references in the supervisor and
application files.
Merge master