oo-diagnostics: Drop unneeded require 'socket'

Drop a "require 'socket'" statement in the test_broker_certificate check.

This require statement was obviated in commit
9b72939f28a6d35354db74cc7464d879bbd3a81e.
oo-diagnostics: Better handle curl error

Catch and report if curl returns an error in the test_broker_certificate
check.

Previously, test_broker_certificate would ignore curl's return code, and so
errors connecting to the broker would turn up as backtraces when
test_broker_certificate would try to parse the output from curl.
Merge pull request #5324 from Miciah/oo-diagnostics-test_broker_certificate-fixes

Merged by openshift-bot
apache-vhost: fix BZ 1090358 on moving custom certs

Bug 1090358 - Can't move gear of app with alias ssl cert between nodes
with vhost frontend
https://bugzilla.redhat.com/show_bug.cgi?id=1090358

When oo-admin-move copies a gear over from one node to another, it
copies over the frontend config files too. Then it reconstructs the
frontend from JSON anyway. This causes a problem with apache-vhost if a
gear alias has a custom cert.

The frontend construction first creates the aliases. Each gets a simple
config file. Crucially, this is only created if there is not already a
custom cert and vhost for the same alias. In the case of a move, since
the custom cert vhost conf is moved over, it already exists, so alias
conf is not created.

Then it creates the custom cert vhosts. This first checks that the alias
config file already exists and throws an exception if not. In the case
of a move, it doesn't exist and isn't recreated, so the frontend
reconstruction fails and the entire move is rolled back.

The fix simply skips raising that exception in the case that the custom
cert vhost conf file already exists, which should only be the case for
gear moves.
Merge pull request #5417 from sosiouxme/bz1090358

Merged by openshift-bot
Bug 1097959 - Add THROTTLER_CHECK_PERIOD to detune Throttler

* Add THROTTLER_CHECK_PERIOD element to /etc/sysconfig/watchman to
  allow Operator to set period for checking cgroup counters
Bug 1088623 - Removed unused .uservars directory references
Merge pull request #5418 from jwhonce/bug/1097959

Merged by openshift-bot
Merge pull request #5420 from jwhonce/bug/1088623

Merged by openshift-bot