Fix shared context issues for security salts#359

MarcelGeo merged 2 commits intodevelopMerginMaps/server:developfrom

fix_token_reuseMerginMaps/server:fix_token_reuseCopy head branch name to clipboard