Without this change there can be more than one ServerProperties in a context with different names. Fixes gh-3476