Merge "Refactor readiness and custom config for ovn-nortd"