Add FIXMEs to be dealt with when configuring the new servers

Change-Id: I48a393d7d8f698124572b6e990a86b1d0d6cfb68