Refactor a bit the timeout part of the namespace manager

Change-Id: I8b46098ee511e9e71290540a35d1d0227ea85749