Merge "Enforcing virtual routers, config/analytics/database nodes"