Merge pull request #3206 from Ethanlm/STORM-3577

[STORM-3578] ClientAuthUtils.insertWorkerTokens removed tokens incorrectly