[Bug 1224292] SUMA has a problem with an old key next to a new one in 15.6