Fix keystore issues upon key retrieval/generation

3 jobs for fix_keystore
Status Name Job ID Coverage
  Build
canceled build #11198

 
  Test
canceled code_quality #11200
allowed to fail

canceled test #11199