[SecurityBundle] Fix security service id generation, space & changelog
Merge remote-tracking branch 'origin/ticket_9272' into ticket_9272