Merge "Avoid duplicate server creation in rebuild test"