Merge "Make sure persistent processes are not replicated for secondary users."