Updated security.token_storage to old security.context service