[SR-Dev] git:janakj/postgres: - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags