CONN-1034: DB and entity updates for endpoint type and entity status