Bug 898014 - Multiclient / Profile Overrides

See the last commit only as this depends on another pull request.