Improve API token metadata to be able to distinguish between API tokens ... It was causing issues during dynamic loading of GitHub and BitBucket branch source ...