Merge "[ovn4nfv] Stable branch for Fraser release."