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