Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

Refs #3817 - Adds a CLIENTID token parsed only for the "Add Client" form from a Reseller

Makes the CLIENTID token available in the add/edit reseller limit tab

See merge request !307