Merge pull request #13346 from mrjana/cnm_integ

Fix network connectivity problem for non-root users