[527081] server name collission should prevent saving, undo should re-validate Change-Id: I889b650bd0339fea57120d51f86542e0cc9dd4e3