Modify the client and server manifests so they can be safely applied to the same machine.