#4132 sorting out restconfig and namespaces
#4132 build changes