Merge branch...

Merge branch '5439-sidekiq-will-now-failure-to-configure-if-sidekiq_cluster-config-is-used' into 'master'

Resolve "Sidekiq will now failure to configure if sidekiq_cluster config is used"

Closes #5439 (closed)

See merge request !4337 (merged)

(cherry picked from commit b2b5f05e)

c0cfbaa3 Update to notify sidekiq_service[sidekiq] instead of c757d8a3 Merge branch 'master' into... 66bcd89c Make gitlab::sidekiq-cluster use sidekiq_service d116f0f7 Use service variable instead of string 6912cbcc Fix remaining specs e11b52df Adding rails_app and template_name to sidekiq_service 25d301a7 Add defaults for user and group in sidekiq_service 8ee324a5 Updates based on MR 5d25f54d Fix geo-secondary recipe to notify sidekiq_service 64412120 Merge branch 'master' into... 246ff06b Update geo secondary to properly check for notification status 263d01d3 Add changelog 2c54db48 Centralize defining of how to restart a service 0c00e43c Make restart_service_resource method public