Parallelise Server updates

Change-Id: I6a2e5841a3a65edb99f227d5849800eb696c9faa
Merge "Parallelise Server updates"