Replace 'pretoria' with 'fnndsc'.
Switch cluster head to rc-majesty.
Upstream changes.