Add obsolete tokens, resolve conflicts, bump ent

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

storage/ent/db/keys.go

@@ -35,11 +35,11 @@ func (*Keys) scanValues(columns []string) ([]interface{}, error) {
 	for i := range columns {
 		switch columns[i] {
 		case keys.FieldVerificationKeys, keys.FieldSigningKey, keys.FieldSigningKeyPub:
-			values[i] = &[]byte{}
+			values[i] = new([]byte)
 		case keys.FieldID:
-			values[i] = &sql.NullString{}
+			values[i] = new(sql.NullString)
 		case keys.FieldNextRotation:
-			values[i] = &sql.NullTime{}
+			values[i] = new(sql.NullTime)
 		default:
 			return nil, fmt.Errorf("unexpected column %q for type Keys", columns[i])
 		}