Only update zone if found

[bdunne]

In trying to remove an unnecessary stub from a test, I found that the zone was unexpectedly being removed from the server. It turns out that the settings reload was trying to set the zone to the default zone since the default config has :server => {:zone => "default"}. I only found this because it was the test environment and I didn't have a "default" zone. If someone enters something invalid in this section of the config they would also have the same problem.

I'll link PR's for:

• The line I was trying to delete from a test
• Why is the zone default a server setting (and name too for that matter)?

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1595158

[miq-bot]

Checked commits bdunne/manageiq@805ac43~...8d67d12 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. ⭐

[jrafanie]

🥇 👍

[juliancheal]

@miq-bot add_label gaprindashvili/yes

It appears that this PR should fix this blocker bz https://bugzilla.redhat.com/show_bug.cgi?id=1595158

[JPrause]

@miq-bot add_label blocker

[simaishi]

Gaprindashvili backport details:

$ git log -1
commit fbb84f082699e1e6ede42aa25e372bf265ab2218
Author: Chris Arcand <chrisarcand@users.noreply.github.com>
Date:   Mon Mar 12 20:16:47 2018 -0500

    Merge pull request #17139 from bdunne/only_update_zone_if_found
    
    Only update zone if found
    (cherry picked from commit 360af512f8c2bfbdc0c3478715805f2e19fdf68d)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1599349