Add compatibility with existing configuration

This will mean that the other nodes don't need to update their
configuration immediately.

Change-Id: I145fbac6c7eff8dbeb9970c891d4930a05384394