- clarify the behavior of the name and identity fields for various rule types, particularly tcp-self and 6to4-self. (cherry picked from commit dea89f2a)