Merge "Fix for few failing network rbac tests"