CIDEVSTC-238: Identity management service extension for security tokens

Adds functionality for the M185 milestone.
Polish the service gateway code