FLUID-5128: Fix and test case for soft namespace deregistration issue, some linting
Merge remote-tracking branch 'amb26/FLUID-5128'

* amb26/FLUID-5128:
  FLUID-5128: Fix and test case for soft namespace deregistration issue, some linting