BS-7407, create token for boundary envents at same time as boundaries are created
Rename variable
detail
Merge branch '6.2.x' into BS-7407_BoundaryTokens