Merge "Fix for exception thrown when no ovs_version set."